Skip to content

Commit 17323e0

Browse files
b-naberb-naber
committed
manually bless 32-bit mir-opt tests
1 parent dbef6e4 commit 17323e0

4 files changed

+25
-25
lines changed

‎src/test/mir-opt/const_allocation2.main.ConstProp.after.32bit.mir

+15-15
Original file line numberDiff line numberDiff line change
@@ -21,41 +21,41 @@ fn main() -> () {
2121
}
2222

2323
alloc1 (static: FOO, size: 8, align: 4) {
24-
╾─alloc28─╼ 03 00 00 00 │ ╾──╼....
24+
╾─alloc22─╼ 03 00 00 00 │ ╾──╼....
2525
}
2626

27-
alloc28 (size: 48, align: 4) {
28-
0x00 │ 00 00 00 00 __ __ __ __ ╾─alloc13─╼ 00 00 00 00 │ ....░░░░╾──╼....
29-
0x10 │ 00 00 00 00 __ __ __ __ ╾─alloc18─╼ 02 00 00 00 │ ....░░░░╾──╼....
30-
0x20 │ 01 00 00 00 2a 00 00 00 ╾─alloc26─╼ 03 00 00 00 │ ....*...╾──╼....
27+
alloc22 (size: 48, align: 4) {
28+
0x00 │ 00 00 00 00 __ __ __ __ ╾─alloc9──╼ 00 00 00 00 │ ....░░░░╾──╼....
29+
0x10 │ 00 00 00 00 __ __ __ __ ╾─alloc14─╼ 02 00 00 00 │ ....░░░░╾──╼....
30+
0x20 │ 01 00 00 00 2a 00 00 00 ╾─alloc20─╼ 03 00 00 00 │ ....*...╾──╼....
3131
}
3232

33-
alloc13 (size: 0, align: 4) {}
33+
alloc9 (size: 0, align: 4) {}
3434

35-
alloc18 (size: 8, align: 4) {
36-
╾─alloc16─╼ ╾─alloc17─╼ │ ╾──╼╾──╼
35+
alloc14 (size: 8, align: 4) {
36+
╾─alloc12─╼ ╾─alloc13─╼ │ ╾──╼╾──╼
3737
}
3838

39-
alloc16 (size: 1, align: 1) {
39+
alloc12 (size: 1, align: 1) {
4040
05 │ .
4141
}
4242

43-
alloc17 (size: 1, align: 1) {
43+
alloc13 (size: 1, align: 1) {
4444
06 │ .
4545
}
4646

47-
alloc26 (size: 12, align: 4) {
48-
╾─a22+0x3─╼ ╾─alloc23─╼ ╾─a25+0x2─╼ │ ╾──╼╾──╼╾──╼
47+
alloc20 (size: 12, align: 4) {
48+
╾─a17+0x3─╼ ╾─alloc18─╼ ╾─a19+0x2─╼ │ ╾──╼╾──╼╾──╼
4949
}
5050

51-
alloc22 (size: 4, align: 1) {
51+
alloc17 (size: 4, align: 1) {
5252
2a 45 15 6f │ *E.o
5353
}
5454

55-
alloc23 (size: 1, align: 1) {
55+
alloc18 (size: 1, align: 1) {
5656
2a │ *
5757
}
5858

59-
alloc25 (size: 4, align: 1) {
59+
alloc19 (size: 4, align: 1) {
6060
2a 45 15 6f │ *E.o
6161
}

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
StorageLive(_1); // scope 0 at $DIR/inline-into-box-place.rs:8:9: 8:11
2424
_2 = SizeOf(std::vec::Vec<u32>); // scope 2 at $DIR/inline-into-box-place.rs:8:29: 8:43
2525
_3 = AlignOf(std::vec::Vec<u32>); // scope 2 at $DIR/inline-into-box-place.rs:8:29: 8:43
26-
_4 = alloc::alloc::exchange_malloc(move _2, move _3) -> bb1; // scope 2 at $DIR/inline-into-box-place.rs:8:29: 8:43
26+
_4 = : unsafe fn(usize, usize) -> *mut u8 {alloc::alloc::exchange_malloc}(move _2, move _3) -> bb1; // scope 2 at $DIR/inline-into-box-place.rs:8:29: 8:43
2727
// mir::Constant
2828
// + span: $DIR/inline-into-box-place.rs:8:29: 8:43
29-
// + literal: Const { ty: unsafe fn(usize, usize) -> *mut u8 {alloc::alloc::exchange_malloc}, val: Value(Scalar(<ZST>)) }
29+
// + literal: Const { ty: unsafe fn(usize, usize) -> *mut u8 {alloc::alloc::exchange_malloc}, val: Value(ValTree::Branch(..)) }
3030
}
3131

3232
bb1: {
@@ -36,7 +36,7 @@
3636
+ StorageLive(_7); // scope 0 at $DIR/inline-into-box-place.rs:8:33: 8:43
3737
+ _7 = &mut (*_5); // scope 0 at $DIR/inline-into-box-place.rs:8:33: 8:43
3838
+ StorageLive(_8); // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
39-
+ _8 = const alloc::raw_vec::RawVec::<u32> { ptr: Unique::<u32> { pointer: NonNull::<u32> { pointer: {0x4 as *const u32} }, _marker: PhantomData::<u32> }, cap: 0_usize, alloc: std::alloc::Global }; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
39+
+ _8 = const alloc::raw_vec::RawVec::<u32>::NEW; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
4040
// mir::Constant
4141
- // + span: $DIR/inline-into-box-place.rs:8:33: 8:41
4242
- // + user_ty: UserType(1)
@@ -46,7 +46,7 @@
4646
- bb2: {
4747
+ // + span: $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
4848
+ // + user_ty: UserType(0)
49-
+ // + literal: Const { ty: alloc::raw_vec::RawVec<u32>, val: Value(ByRef(..)) }
49+
+ // + literal: Const { ty: alloc::raw_vec::RawVec<u32>, val: Unevaluated(alloc::raw_vec::RawVec::<T>::NEW, [u32], None) }
5050
+ Deinit((*_7)); // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
5151
+ ((*_7).0: alloc::raw_vec::RawVec<u32>) = move _8; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
5252
+ ((*_7).1: usize) = const 0_usize; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
@@ -71,10 +71,10 @@
7171
- }
7272
-
7373
- bb5 (cleanup): {
74-
- _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)) -> bb4; // scope 0 at $DIR/inline-into-box-place.rs:8:42: 8:43
74+
- _6 = : unsafe fn(Unique::<Vec<u32>>, std::alloc::Global) {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)) -> bb4; // scope 0 at $DIR/inline-into-box-place.rs:8:42: 8:43
7575
- // mir::Constant
7676
- // + span: $DIR/inline-into-box-place.rs:8:42: 8:43
77-
- // + literal: Const { ty: unsafe fn(Unique<Vec<u32>>, std::alloc::Global) {alloc::alloc::box_free::<Vec<u32>, std::alloc::Global>}, val: Value(Scalar(<ZST>)) }
77+
- // + literal: Const { ty: unsafe fn(Unique<Vec<u32>>, std::alloc::Global) {alloc::alloc::box_free::<Vec<u32>, std::alloc::Global>}, val: Value(ValTree::Branch(..)) }
7878
}
7979
}
8080

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
|
2424
fn main() -> () {
2525
let mut _0: (); // return place in scope 0 at $DIR/region-subtyping-basic.rs:16:11: 16:11
26-
let mut _1: [usize; Const { ty: usize, kind: Value(Scalar(0x00000003)) }]; // in scope 0 at $DIR/region-subtyping-basic.rs:17:9: 17:14
26+
let mut _1: [usize; Const { ty: usize, kind: Value(Leaf(0x00000003)) }]; // in scope 0 at $DIR/region-subtyping-basic.rs:17:9: 17:14
2727
let _3: usize; // in scope 0 at $DIR/region-subtyping-basic.rs:18:16: 18:17
2828
let mut _4: usize; // in scope 0 at $DIR/region-subtyping-basic.rs:18:14: 18:18
2929
let mut _5: bool; // in scope 0 at $DIR/region-subtyping-basic.rs:18:14: 18:18
@@ -63,7 +63,7 @@ fn main() -> () {
6363
FakeRead(ForLet(None), _6); // bb1[4]: scope 2 at $DIR/region-subtyping-basic.rs:19:9: 19:10
6464
StorageLive(_7); // bb1[5]: scope 3 at $DIR/region-subtyping-basic.rs:20:8: 20:12
6565
_7 = const ConstValue(Scalar(0x01): bool); // bb1[6]: scope 3 at $DIR/region-subtyping-basic.rs:20:8: 20:12
66-
switchInt(move _7) -> [Const(Value(Scalar(0x00)): bool): bb4, otherwise: bb2]; // bb1[7]: scope 3 at $DIR/region-subtyping-basic.rs:20:8: 20:12
66+
switchInt(move _7) -> [ConstValue(Scalar(0x00): bool): bb4, otherwise: bb2]; // bb1[7]: scope 3 at $DIR/region-subtyping-basic.rs:20:8: 20:12
6767
}
6868

6969
bb2: {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ fn std::ptr::drop_in_place(_1: *mut Vec<i32>) -> () {
3131

3232
bb6: {
3333
_2 = &mut (*_1); // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
34-
_3 = <Vec<i32> as Drop>::drop(move _2) -> [return: bb5, unwind: bb4]; // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
34+
_3 = : for<'r> fn(&'r mut Vec::<i32>) {<Vec<i32> as Drop>::drop}(move _2) -> [return: bb5, unwind: bb4]; // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
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(Scalar(<ZST>)) }
37+
// + literal: Const { ty: for<'r> fn(&'r mut Vec<i32>) {<Vec<i32> as Drop>::drop}, val: Value(ValTree::Branch(..)) }
3838
}
3939
}

0 commit comments

Comments
 (0)