Skip to content

Commit 7ce3e43

Browse files
steffahnsteffahn
committed
Manually bless mir-opt 32bit output changes, from CI
1 parent 05a7131 commit 7ce3e43

7 files changed

+12
-12
lines changed

‎src/test/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.32bit.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fn main() -> () {
3939
_5 = foo(move _6) -> bb1; // scope 4 at $DIR/array-index-is-temporary.rs:+4:21: +4:27
4040
// mir::Constant
4141
// + span: $DIR/array-index-is-temporary.rs:16:21: 16:24
42-
// + literal: Const { ty: unsafe fn(*mut usize) -> u32 {foo}, val: Value(<ZST>) }
42+
// + literal: Const { ty: [fn item {foo}: unsafe fn(*mut usize) -> u32], val: Value(<ZST>) }
4343
}
4444

4545
bb1: {

‎src/test/mir-opt/inline/inline_into_box_place.main.Inline.32bit.diff

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
_4 = alloc::alloc::exchange_malloc(move _2, move _3) -> bb1; // scope 2 at $DIR/inline-into-box-place.rs:+1:29: +1:43
2929
// mir::Constant
3030
// + span: $DIR/inline-into-box-place.rs:8:29: 8:43
31-
// + literal: Const { ty: unsafe fn(usize, usize) -> *mut u8 {alloc::alloc::exchange_malloc}, val: Value(<ZST>) }
31+
// + literal: Const { ty: [fn item {alloc::alloc::exchange_malloc}: unsafe fn(usize, usize) -> *mut u8], val: Value(<ZST>) }
3232
}
3333

3434
bb1: {
@@ -44,7 +44,7 @@
4444
// mir::Constant
4545
- // + span: $DIR/inline-into-box-place.rs:8:33: 8:41
4646
- // + user_ty: UserType(1)
47-
- // + literal: Const { ty: fn() -> Vec<u32> {Vec::<u32>::new}, val: Value(<ZST>) }
47+
- // + literal: Const { ty: [fn item {Vec::<u32>::new}: fn() -> Vec<u32>], val: Value(<ZST>) }
4848
- }
4949
-
5050
- bb2: {
@@ -75,7 +75,7 @@
7575
- _6 = alloc::alloc::box_free::<Vec<u32>, std::alloc::Global>(move (_5.0: std::ptr::Unique<std::vec::Vec<u32>>), move (_5.1: std::alloc::Global)) -> bb5; // scope 0 at $DIR/inline-into-box-place.rs:+1:42: +1:43
7676
- // mir::Constant
7777
- // + span: $DIR/inline-into-box-place.rs:8:42: 8:43
78-
- // + literal: Const { ty: unsafe fn(Unique<Vec<u32>>, std::alloc::Global) {alloc::alloc::box_free::<Vec<u32>, std::alloc::Global>}, val: Value(<ZST>) }
78+
- // + literal: Const { ty: [fn item {alloc::alloc::box_free::<Vec<u32>, std::alloc::Global>}: unsafe fn(Unique<Vec<u32>>, std::alloc::Global)], val: Value(<ZST>) }
7979
- }
8080
-
8181
- bb5 (cleanup): {

‎src/test/mir-opt/issue_72181.main.mir_map.0.32bit.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ fn main() -> () {
2525
_1 = std::mem::size_of::<Foo>() -> [return: bb1, unwind: bb3]; // scope 0 at $DIR/issue-72181.rs:+1:13: +1:34
2626
// mir::Constant
2727
// + span: $DIR/issue-72181.rs:24:13: 24:32
28-
// + literal: Const { ty: fn() -> usize {std::mem::size_of::<Foo>}, val: Value(<ZST>) }
28+
// + literal: Const { ty: [fn item {std::mem::size_of::<Foo>}: fn() -> usize], val: Value(<ZST>) }
2929
}
3030

3131
bb1: {

‎src/test/mir-opt/issue_73223.main.PreCodegen.32bit.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
_14 = core::panicking::assert_failed::<i32, i32>(const core::panicking::AssertKind::Eq, move _15, move _17, move _19); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
9999
// mir::Constant
100100
// + span: $SRC_DIR/core/src/macros/mod.rs:LL:COL
101-
// + literal: Const { ty: for<'r, 's, 't0> fn(core::panicking::AssertKind, &'r i32, &'s i32, Option<Arguments<'t0>>) -> ! {core::panicking::assert_failed::<i32, i32>}, val: Value(<ZST>) }
101+
// + literal: Const { ty: [fn item {core::panicking::assert_failed::<i32, i32>}: for<'r, 's, 't0> fn(core::panicking::AssertKind, &'r i32, &'s i32, Option<Arguments<'t0>>) -> !], val: Value(<ZST>) }
102102
// mir::Constant
103103
// + span: $SRC_DIR/core/src/macros/mod.rs:LL:COL
104104
// + literal: Const { ty: core::panicking::AssertKind, val: Value(Scalar(0x00)) }

‎src/test/mir-opt/issue_73223.main.SimplifyArmIdentity.32bit.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
_21 = core::panicking::assert_failed::<i32, i32>(const core::panicking::AssertKind::Eq, move _23, move _25, move _27); // scope 5 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
136136
// mir::Constant
137137
// + span: $SRC_DIR/core/src/macros/mod.rs:LL:COL
138-
// + literal: Const { ty: for<'r, 's, 't0> fn(core::panicking::AssertKind, &'r i32, &'s i32, Option<Arguments<'t0>>) -> ! {core::panicking::assert_failed::<i32, i32>}, val: Value(<ZST>) }
138+
// + literal: Const { ty: [fn item {core::panicking::assert_failed::<i32, i32>}: for<'r, 's, 't0> fn(core::panicking::AssertKind, &'r i32, &'s i32, Option<Arguments<'t0>>) -> !], val: Value(<ZST>) }
139139
// mir::Constant
140140
// + span: $SRC_DIR/core/src/macros/mod.rs:LL:COL
141141
// + literal: Const { ty: core::panicking::AssertKind, val: Value(Scalar(0x00)) }

‎src/test/mir-opt/nll/region_subtyping_basic.main.nll.0.32bit.mir

+4-4
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ fn main() -> () {
7070
StorageLive(_8); // bb2[0]: scope 3 at $DIR/region-subtyping-basic.rs:+5:9: +5:18
7171
StorageLive(_9); // bb2[1]: scope 3 at $DIR/region-subtyping-basic.rs:+5:15: +5:17
7272
_9 = (*_6); // bb2[2]: scope 3 at $DIR/region-subtyping-basic.rs:+5:15: +5:17
73-
_8 = ConstValue(ZeroSized: fn(usize) -> bool {use_x})(move _9) -> [return: bb3, unwind: bb7]; // bb2[3]: scope 3 at $DIR/region-subtyping-basic.rs:+5:9: +5:18
73+
_8 = ConstValue(ZeroSized: [fn item {use_x}: fn(usize) -> bool])(move _9) -> [return: bb3, unwind: bb7]; // bb2[3]: scope 3 at $DIR/region-subtyping-basic.rs:+5:9: +5:18
7474
// mir::Constant
7575
// + span: $DIR/region-subtyping-basic.rs:21:9: 21:14
76-
// + literal: Const { ty: fn(usize) -> bool {use_x}, val: Value(<ZST>) }
76+
// + literal: Const { ty: [fn item {use_x}: fn(usize) -> bool], val: Value(<ZST>) }
7777
}
7878

7979
bb3: {
@@ -85,10 +85,10 @@ fn main() -> () {
8585

8686
bb4: {
8787
StorageLive(_10); // bb4[0]: scope 3 at $DIR/region-subtyping-basic.rs:+7:9: +7:18
88-
_10 = ConstValue(ZeroSized: fn(usize) -> bool {use_x})(const ConstValue(Scalar(0x00000016): usize)) -> [return: bb5, unwind: bb7]; // bb4[1]: scope 3 at $DIR/region-subtyping-basic.rs:+7:9: +7:18
88+
_10 = ConstValue(ZeroSized: [fn item {use_x}: fn(usize) -> bool])(const ConstValue(Scalar(0x00000016): usize)) -> [return: bb5, unwind: bb7]; // bb4[1]: scope 3 at $DIR/region-subtyping-basic.rs:+7:9: +7:18
8989
// mir::Constant
9090
// + span: $DIR/region-subtyping-basic.rs:23:9: 23:14
91-
// + literal: Const { ty: fn(usize) -> bool {use_x}, val: Value(<ZST>) }
91+
// + literal: Const { ty: [fn item {use_x}: fn(usize) -> bool], val: Value(<ZST>) }
9292
}
9393

9494
bb5: {

‎src/test/mir-opt/unusual_item_types.core.ptr-drop_in_place.Vec_i32_.AddMovesForPackedDrops.before.32bit.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ fn std::ptr::drop_in_place(_1: *mut Vec<i32>) -> () {
3434
_3 = <Vec<i32> as Drop>::drop(move _2) -> [return: bb5, unwind: bb4]; // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:+0:1: +0:56
3535
// mir::Constant
3636
// + span: $SRC_DIR/core/src/ptr/mod.rs:LL:COL
37-
// + literal: Const { ty: for<'r> fn(&'r mut Vec<i32>) {<Vec<i32> as Drop>::drop}, val: Value(<ZST>) }
37+
// + literal: Const { ty: [fn item {<Vec<i32> as Drop>::drop}: for<'r> fn(&'r mut Vec<i32>)], val: Value(<ZST>) }
3838
}
3939
}

0 commit comments

Comments
 (0)