Skip to content

Commit 1390405

Browse files
committed
Update hax
1 parent 89b6a1d commit 1390405

5 files changed

Lines changed: 57 additions & 12 deletions

File tree

charon/Cargo.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

charon/tests/ui/closures.out

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ where
729729
let @2: &'_ (T); // anonymous local
730730

731731
@2 := &*((*(state@1)).0)
732-
@0 := {test_crate::{test_crate::Foo<'a, T>[@TraitClause0]}::test_nested_closures::closure::closure::closure<'_, T>} {move (@2)}
732+
@0 := {test_crate::{test_crate::Foo<'a, T>[@TraitClause0]}::test_nested_closures::closure::closure::closure<'_, T>[@TraitClause0, @TraitClause1]} {move (@2)}
733733
drop @2
734734
return
735735
}
@@ -744,7 +744,7 @@ where
744744
let @2: &'_ (T); // anonymous local
745745

746746
@2 := &*((*(state@1)).0)
747-
@0 := {test_crate::{test_crate::Foo<'a, T>[@TraitClause0]}::test_nested_closures::closure::closure<'_, T>} {move (@2)}
747+
@0 := {test_crate::{test_crate::Foo<'a, T>[@TraitClause0]}::test_nested_closures::closure::closure<'_, T>[@TraitClause0, @TraitClause1]} {move (@2)}
748748
drop @2
749749
return
750750
}
@@ -768,7 +768,7 @@ where
768768
let @11: (); // anonymous local
769769

770770
@3 := &*(*(x@1))
771-
clo@2 := {test_crate::{test_crate::Foo<'a, T>[@TraitClause0]}::test_nested_closures::closure<'_, T>} {move (@3)}
771+
clo@2 := {test_crate::{test_crate::Foo<'a, T>[@TraitClause0]}::test_nested_closures::closure<'_, T>[@TraitClause0, @TraitClause1]} {move (@3)}
772772
drop @3
773773
@fake_read(clo@2)
774774
@8 := &clo@2
Lines changed: 50 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,50 @@
1-
thread 'main' panicked at /home/nadrieril/.cargo/registry/src/index.crates.io-6f17d22bba15001f/index_vec-0.1.4/src/indexing.rs:37:10:
2-
index out of bounds: the len is 1 but the index is 1
3-
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
ERROR Compilation panicked
1+
# Final LLBC before serialization:
2+
3+
#[lang_item("sized")]
4+
pub trait core::marker::Sized<Self>
5+
6+
pub trait test_crate::PrimeField<Self, Self_Repr>
7+
{
8+
parent_clause0 : [@TraitClause0]: core::marker::Sized<Self_Repr>
9+
}
10+
11+
pub struct test_crate::SqrtTables<F>
12+
where
13+
[@TraitClause0]: core::marker::Sized<F>,
14+
=
15+
{
16+
F,
17+
}
18+
19+
fn test_crate::{test_crate::SqrtTables<F>[@TraitClause0]}::sqrt_common::closure<'_0, F, Clause1_Repr>(@1: &'_0 (()), @2: ())
20+
where
21+
[@TraitClause0]: core::marker::Sized<F>,
22+
[@TraitClause1]: test_crate::PrimeField<F, Clause1_Repr>,
23+
{
24+
let @0: (); // return
25+
let state@1: &'_0 (()); // arg #1
26+
let _x@2: (); // arg #2
27+
28+
@0 := ()
29+
@0 := ()
30+
return
31+
}
32+
33+
pub fn test_crate::{test_crate::SqrtTables<F>[@TraitClause0]}::sqrt_common<F, Clause1_Repr>()
34+
where
35+
[@TraitClause0]: core::marker::Sized<F>,
36+
[@TraitClause1]: test_crate::PrimeField<F, Clause1_Repr>,
37+
{
38+
let @0: (); // return
39+
let _closure@1: fn(()); // local
40+
41+
_closure@1 := {test_crate::{test_crate::SqrtTables<F>[@TraitClause0]}::sqrt_common::closure<F, Clause1_Repr>[@TraitClause0, @TraitClause1]} {}
42+
@fake_read(_closure@1)
43+
@0 := ()
44+
drop _closure@1
45+
@0 := ()
46+
return
47+
}
48+
49+
50+

charon/tests/ui/regressions/closure-inside-impl-with-bound-with-assoc-ty.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//@ charon-args=--remove-associated-types=*
2-
//@ known-panic
32
//! Regression test for issue https://github.com/AeneasVerif/charon/issues/627
43
pub trait PrimeField {
54
type Repr;

charon/tests/ui/simple/closure-inside-impl.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ where
3333
let @0: (); // return
3434
let _closure@1: fn(()); // local
3535

36-
_closure@1 := {test_crate::{test_crate::Foo<F>[@TraitClause0]}::method::closure<F, T>[@TraitClause1]} {}
36+
_closure@1 := {test_crate::{test_crate::Foo<F>[@TraitClause0]}::method::closure<F, T>[@TraitClause0, @TraitClause1]} {}
3737
@fake_read(_closure@1)
3838
@0 := ()
3939
drop _closure@1

0 commit comments

Comments
 (0)