Skip to content

Commit

Permalink
Upgrade toolchain to 2024-11-28
Browse files Browse the repository at this point in the history
Update parameter and function indices in LLBC tests (again) that appear
to have changed without any of the upstream changes obviously causing
this. Those tests will eventually be removed in upcoming changes.

Resolves: #3752
  • Loading branch information
tautschnig committed Dec 3, 2024
1 parent 1765aa5 commit 1b4141d
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 24 deletions.
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
# SPDX-License-Identifier: Apache-2.0 OR MIT

[toolchain]
channel = "nightly-2024-11-27"
channel = "nightly-2024-11-28"
components = ["llvm-tools", "rustc-dev", "rust-src", "rustfmt"]
2 changes: 1 addition & 1 deletion tests/expected/llbc/enum/expected
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ fn test::main()
let i@2: i32; // local

e@1 := test::MyEnum::A { 0: const (1 : i32) }
i@2 := @Fun0(move (e@1))
i@2 := @Fun1(move (e@1))
drop i@2
@0 := ()
return
Expand Down
2 changes: 1 addition & 1 deletion tests/expected/llbc/generic/expected
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ fn test::main()

@2 := core::option::Option::Some { 0: const (1 : i32) }
@3 := core::option::Option::Some { 0: const (2 : i32) }
e@1 := @Fun0(move (@2), move (@3))
e@1 := @Fun1(move (@2), move (@3))
drop @3
drop @2
drop e@1
Expand Down
32 changes: 12 additions & 20 deletions tests/expected/llbc/projection/expected
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,25 @@ struct test::MyStruct =
a: i32,
b: i32,
}

enum test::MyEnum0 =
| A(0: @Adt1, 1: i32)
| A(0: @Adt0, 1: i32)
| B()


enum test::MyEnum =
| A(0: @Adt1, 1: @Adt2)
| A(0: @Adt0, 1: @Adt2)
| B(0: (i32, i32))


fn test::enum_match(@1: @Adt0) -> i32
fn test::enum_match(@1: @Adt1) -> i32
{
let @0: i32; // return
let e@1: @Adt0; // arg #1
let s@2: @Adt1; // local
let e@1: @Adt1; // arg #1
let s@2: @Adt0; // local
let e0@3: @Adt2; // local
let s1@4: @Adt1; // local
let s1@4: @Adt0; // local
let b@5: i32; // local
let @6: i32; // anonymous local
let @7: i32; // anonymous local
let @8: i32; // anonymous local
let a@9: i32; // local
let b@10: i32; // local

match e@1 {
0 => {
s@2 := move ((e@1 as variant @0).0)
Expand Down Expand Up @@ -62,22 +56,20 @@ fn test::enum_match(@1: @Adt0) -> i32
}
return
}

fn test::main()
{
let @0: (); // return
let s@1: @Adt1; // local
let s0@2: @Adt1; // local
let e@3: @Adt0; // local
let s@1: @Adt0; // local
let s0@2: @Adt0; // local
let e@3: @Adt1; // local
let @4: @Adt2; // anonymous local
let i@5: i32; // local

s@1 := @Adt1 { a: const (1 : i32), b: const (2 : i32) }
s0@2 := @Adt1 { a: const (1 : i32), b: const (2 : i32) }
s@1 := @Adt0 { a: const (1 : i32), b: const (2 : i32) }
s0@2 := @Adt0 { a: const (1 : i32), b: const (2 : i32) }
@4 := test::MyEnum0::A { 0: move (s0@2), 1: const (1 : i32) }
e@3 := test::MyEnum::A { 0: move (s@1), 1: move (@4) }
drop @4
i@5 := @Fun0(move (e@3))
i@5 := @Fun1(move (e@3))
drop i@5
@0 := ()
return
Expand Down
2 changes: 1 addition & 1 deletion tests/expected/llbc/tuple/expected
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ fn test::main()
let @2: (i32, i32); // anonymous local

@2 := (const (1 : i32), const (2 : i32))
s@1 := @Fun0(move (@2))
s@1 := @Fun1(move (@2))
drop @2
drop s@1
@0 := ()
Expand Down

0 comments on commit 1b4141d

Please sign in to comment.