Skip to content

Commit 954fbe3

Browse files
beepster4096beepster4096
committed
fix inline_into_box_place test
1 parent cb41788 commit 954fbe3

File tree

1 file changed

+23
-19
lines changed

1 file changed

+23
-19
lines changed

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

+23-19
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@
1010
let mut _5: std::boxed::Box<std::vec::Vec<u32>>; // in scope 0 at $DIR/inline-into-box-place.rs:8:29: 8:43
1111
let mut _6: (); // in scope 0 at $DIR/inline-into-box-place.rs:8:42: 8:43
1212
let mut _7: *const std::vec::Vec<u32>; // in scope 0 at $DIR/inline-into-box-place.rs:8:29: 8:43
13-
+ let mut _8: &mut std::vec::Vec<u32>; // in scope 0 at $DIR/inline-into-box-place.rs:8:33: 8:43
13+
let mut _8: *const std::vec::Vec<u32>; // in scope 0 at $DIR/inline-into-box-place.rs:8:29: 8:43
14+
+ let mut _9: &mut std::vec::Vec<u32>; // in scope 0 at $DIR/inline-into-box-place.rs:8:33: 8:43
1415
scope 1 {
1516
debug _x => _1; // in scope 1 at $DIR/inline-into-box-place.rs:8:9: 8:11
1617
}
1718
scope 2 {
1819
}
1920
+ scope 3 (inlined Vec::<u32>::new) { // at $DIR/inline-into-box-place.rs:8:33: 8:43
20-
+ let mut _8: alloc::raw_vec::RawVec<u32>; // in scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
21+
+ let mut _10: alloc::raw_vec::RawVec<u32>; // in scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
2122
+ }
2223

2324
bb0: {
@@ -33,11 +34,13 @@
3334
bb1: {
3435
StorageLive(_5); // scope 0 at $DIR/inline-into-box-place.rs:8:29: 8:43
3536
_5 = ShallowInitBox(move _4, std::vec::Vec<u32>); // scope 0 at $DIR/inline-into-box-place.rs:8:29: 8:43
36-
- (*((_5.0: std::ptr::Unique<std::vec::Vec<u32>>).0: *const std::vec::Vec<u32>)) = Vec::<u32>::new() -> [return: bb2, unwind: bb5]; // scope 0 at $DIR/inline-into-box-place.rs:8:33: 8:43
37-
+ StorageLive(_7); // scope 0 at $DIR/inline-into-box-place.rs:8:33: 8:43
38-
+ _7 = &mut (*_5); // scope 0 at $DIR/inline-into-box-place.rs:8:33: 8:43
39-
+ StorageLive(_8); // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
40-
+ _8 = const alloc::raw_vec::RawVec::<u32>::NEW; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
37+
StorageLive(_7); // scope 0 at $DIR/inline-into-box-place.rs:8:33: 8:43
38+
_7 = (((_5.0: std::ptr::Unique<std::vec::Vec<u32>>).0: std::ptr::NonNull<std::vec::Vec<u32>>).0: *const std::vec::Vec<u32>); // scope 0 at $DIR/inline-into-box-place.rs:8:33: 8:43
39+
- (*_7) = Vec::<u32>::new() -> [return: bb2, unwind: bb4]; // scope 0 at $DIR/inline-into-box-place.rs:8:33: 8:43
40+
+ StorageLive(_9); // scope 0 at $DIR/inline-into-box-place.rs:8:33: 8:43
41+
+ _9 = &mut (*_7); // scope 0 at $DIR/inline-into-box-place.rs:8:33: 8:43
42+
+ StorageLive(_10); // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
43+
+ _10 = const alloc::raw_vec::RawVec::<u32>::NEW; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
4144
// mir::Constant
4245
- // + span: $DIR/inline-into-box-place.rs:8:33: 8:41
4346
- // + user_ty: UserType(1)
@@ -48,15 +51,16 @@
4851
+ // + span: $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
4952
+ // + user_ty: UserType(0)
5053
+ // + literal: Const { ty: alloc::raw_vec::RawVec<u32>, val: Unevaluated(alloc::raw_vec::RawVec::<T>::NEW, [u32], None) }
51-
+ Deinit((*_7)); // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
52-
+ ((*_7).0: alloc::raw_vec::RawVec<u32>) = move _8; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
53-
+ ((*_7).1: usize) = const 0_usize; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
54-
+ StorageDead(_8); // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
55-
+ StorageDead(_7); // scope 0 at $DIR/inline-into-box-place.rs:8:33: 8:43
54+
+ Deinit((*_9)); // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
55+
+ ((*_9).0: alloc::raw_vec::RawVec<u32>) = move _10; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
56+
+ ((*_9).1: usize) = const 0_usize; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
57+
+ StorageDead(_10); // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
58+
+ StorageDead(_9); // scope 0 at $DIR/inline-into-box-place.rs:8:33: 8:43
59+
StorageDead(_7); // scope 0 at $DIR/inline-into-box-place.rs:8:33: 8:43
5660
_1 = move _5; // scope 0 at $DIR/inline-into-box-place.rs:8:29: 8:43
5761
StorageDead(_5); // scope 0 at $DIR/inline-into-box-place.rs:8:42: 8:43
5862
_0 = const (); // scope 0 at $DIR/inline-into-box-place.rs:7:11: 9:2
59-
- drop(_1) -> [return: bb3, unwind: bb4]; // scope 0 at $DIR/inline-into-box-place.rs:9:1: 9:2
63+
- drop(_1) -> [return: bb3, unwind: bb5]; // scope 0 at $DIR/inline-into-box-place.rs:9:1: 9:2
6064
+ drop(_1) -> [return: bb2, unwind: bb3]; // scope 0 at $DIR/inline-into-box-place.rs:9:1: 9:2
6165
}
6266

@@ -67,16 +71,16 @@
6771
}
6872

6973
- bb4 (cleanup): {
70-
+ bb3 (cleanup): {
71-
resume; // scope 0 at $DIR/inline-into-box-place.rs:7:1: 9:2
72-
- }
73-
-
74-
- bb5 (cleanup): {
7574
- StorageDead(_7); // scope 0 at $DIR/inline-into-box-place.rs:8:33: 8:43
76-
- _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
75+
- _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:8:42: 8:43
7776
- // mir::Constant
7877
- // + span: $DIR/inline-into-box-place.rs:8:42: 8:43
7978
- // + literal: Const { ty: unsafe fn(Unique<Vec<u32>>, std::alloc::Global) {alloc::alloc::box_free::<Vec<u32>, std::alloc::Global>}, val: Value(Scalar(<ZST>)) }
79+
- }
80+
-
81+
- bb5 (cleanup): {
82+
+ bb3 (cleanup): {
83+
resume; // scope 0 at $DIR/inline-into-box-place.rs:7:1: 9:2
8084
}
8185
}
8286

0 commit comments

Comments
 (0)