Skip to content

Commit e008492

Browse files
eddybeddyb
committed
tests: don't use only-64bit in mir-opt tests.
1 parent 15719cd commit e008492

File tree

3 files changed

+77
-1
lines changed

3 files changed

+77
-1
lines changed

‎src/test/mir-opt/inline/inline-into-box-place.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// ignore-wasm32-bare compiled with panic=abort by default
22
// compile-flags: -Z mir-opt-level=3
3-
// only-64bit FIXME: the mir representation of RawVec depends on ptr size
3+
// EMIT_MIR_FOR_EACH_BIT_WIDTH
44
#![feature(box_syntax)]
55

66
// EMIT_MIR rustc.main.Inline.diff

‎src/test/mir-opt/inline/inline-into-box-place/32bit/rustc.main.Inline.diff

+76
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
- // MIR for `main` before Inline
2+
+ // MIR for `main` after Inline
3+
4+
fn main() -> () {
5+
let mut _0: (); // return place in scope 0 at $DIR/inline-into-box-place.rs:7:11: 7:11
6+
let _1: std::boxed::Box<std::vec::Vec<u32>> as UserTypeProjection { base: UserType(0), projs: [] }; // in scope 0 at $DIR/inline-into-box-place.rs:8:9: 8:11
7+
let mut _2: std::boxed::Box<std::vec::Vec<u32>>; // in scope 0 at $DIR/inline-into-box-place.rs:8:29: 8:43
8+
let mut _3: (); // in scope 0 at $DIR/inline-into-box-place.rs:8:42: 8:43
9+
+ let mut _4: &mut std::vec::Vec<u32>; // in scope 0 at $DIR/inline-into-box-place.rs:8:33: 8:43
10+
scope 1 {
11+
debug _x => _1; // in scope 1 at $DIR/inline-into-box-place.rs:8:9: 8:11
12+
}
13+
+ scope 2 {
14+
+ }
15+
16+
bb0: {
17+
StorageLive(_1); // bb0[0]: scope 0 at $DIR/inline-into-box-place.rs:8:9: 8:11
18+
StorageLive(_2); // bb0[1]: scope 0 at $DIR/inline-into-box-place.rs:8:29: 8:43
19+
_2 = Box(std::vec::Vec<u32>); // bb0[2]: scope 0 at $DIR/inline-into-box-place.rs:8:29: 8:43
20+
- (*_2) = const std::vec::Vec::<u32>::new() -> [return: bb2, unwind: bb4]; // bb0[3]: scope 0 at $DIR/inline-into-box-place.rs:8:33: 8:43
21+
+ _4 = &mut (*_2); // bb0[3]: scope 0 at $DIR/inline-into-box-place.rs:8:33: 8:43
22+
+ ((*_4).0: alloc::raw_vec::RawVec<u32>) = const ByRef { alloc: Allocation { bytes: [4, 0, 0, 0, 0, 0, 0, 0], relocations: Relocations(SortedMap { data: [] }), undef_mask: UndefMask { blocks: [255], len: Size { raw: 8 } }, size: Size { raw: 8 }, align: Align { pow2: 2 }, mutability: Not, extra: () }, offset: Size { raw: 0 } }: alloc::raw_vec::RawVec::<u32>; // bb0[4]: scope 2 at $SRC_DIR/liballoc/vec.rs:LL:COL
23+
// ty::Const
24+
- // + ty: fn() -> std::vec::Vec<u32> {std::vec::Vec::<u32>::new}
25+
- // + val: Value(Scalar(<ZST>))
26+
+ // + ty: alloc::raw_vec::RawVec<u32>
27+
+ // + val: Value(ByRef { alloc: Allocation { bytes: [4, 0, 0, 0, 0, 0, 0, 0], relocations: Relocations(SortedMap { data: [] }), undef_mask: UndefMask { blocks: [255], len: Size { raw: 8 } }, size: Size { raw: 8 }, align: Align { pow2: 2 }, mutability: Not, extra: () }, offset: Size { raw: 0 } })
28+
// mir::Constant
29+
- // + span: $DIR/inline-into-box-place.rs:8:33: 8:41
30+
- // + user_ty: UserType(1)
31+
- // + literal: Const { ty: fn() -> std::vec::Vec<u32> {std::vec::Vec::<u32>::new}, val: Value(Scalar(<ZST>)) }
32+
+ // + span: $SRC_DIR/liballoc/vec.rs:LL:COL
33+
+ // + user_ty: UserType(0)
34+
+ // + literal: Const { ty: alloc::raw_vec::RawVec<u32>, val: Value(ByRef { alloc: Allocation { bytes: [4, 0, 0, 0, 0, 0, 0, 0], relocations: Relocations(SortedMap { data: [] }), undef_mask: UndefMask { blocks: [255], len: Size { raw: 8 } }, size: Size { raw: 8 }, align: Align { pow2: 2 }, mutability: Not, extra: () }, offset: Size { raw: 0 } }) }
35+
+ ((*_4).1: usize) = const 0usize; // bb0[5]: scope 2 at $SRC_DIR/liballoc/vec.rs:LL:COL
36+
+ // ty::Const
37+
+ // + ty: usize
38+
+ // + val: Value(Scalar(0x00000000))
39+
+ // mir::Constant
40+
+ // + span: $SRC_DIR/liballoc/vec.rs:LL:COL
41+
+ // + literal: Const { ty: usize, val: Value(Scalar(0x00000000)) }
42+
+ _1 = move _2; // bb0[6]: scope 0 at $DIR/inline-into-box-place.rs:8:29: 8:43
43+
+ StorageDead(_2); // bb0[7]: scope 0 at $DIR/inline-into-box-place.rs:8:42: 8:43
44+
+ _0 = (); // bb0[8]: scope 0 at $DIR/inline-into-box-place.rs:7:11: 9:2
45+
+ drop(_1) -> [return: bb2, unwind: bb1]; // bb0[9]: scope 0 at $DIR/inline-into-box-place.rs:9:1: 9:2
46+
}
47+
48+
bb1 (cleanup): {
49+
resume; // bb1[0]: scope 0 at $DIR/inline-into-box-place.rs:7:1: 9:2
50+
}
51+
52+
bb2: {
53+
- _1 = move _2; // bb2[0]: scope 0 at $DIR/inline-into-box-place.rs:8:29: 8:43
54+
- StorageDead(_2); // bb2[1]: scope 0 at $DIR/inline-into-box-place.rs:8:42: 8:43
55+
- _0 = (); // bb2[2]: scope 0 at $DIR/inline-into-box-place.rs:7:11: 9:2
56+
- drop(_1) -> [return: bb3, unwind: bb1]; // bb2[3]: scope 0 at $DIR/inline-into-box-place.rs:9:1: 9:2
57+
- }
58+
-
59+
- bb3: {
60+
- StorageDead(_1); // bb3[0]: scope 0 at $DIR/inline-into-box-place.rs:9:1: 9:2
61+
- return; // bb3[1]: scope 0 at $DIR/inline-into-box-place.rs:9:2: 9:2
62+
- }
63+
-
64+
- bb4 (cleanup): {
65+
- _3 = const alloc::alloc::box_free::<std::vec::Vec<u32>>(move (_2.0: std::ptr::Unique<std::vec::Vec<u32>>)) -> bb1; // bb4[0]: scope 0 at $DIR/inline-into-box-place.rs:8:42: 8:43
66+
- // ty::Const
67+
- // + ty: unsafe fn(std::ptr::Unique<std::vec::Vec<u32>>) {alloc::alloc::box_free::<std::vec::Vec<u32>>}
68+
- // + val: Value(Scalar(<ZST>))
69+
- // mir::Constant
70+
- // + span: $DIR/inline-into-box-place.rs:8:42: 8:43
71+
- // + literal: Const { ty: unsafe fn(std::ptr::Unique<std::vec::Vec<u32>>) {alloc::alloc::box_free::<std::vec::Vec<u32>>}, val: Value(Scalar(<ZST>)) }
72+
+ StorageDead(_1); // bb2[0]: scope 0 at $DIR/inline-into-box-place.rs:9:1: 9:2
73+
+ return; // bb2[1]: scope 0 at $DIR/inline-into-box-place.rs:9:2: 9:2
74+
}
75+
}
76+

‎src/test/mir-opt/inline/inline-into-box-place/rustc.main.Inline.diff renamed to ‎src/test/mir-opt/inline/inline-into-box-place/64bit/rustc.main.Inline.diff

File renamed without changes.

0 commit comments

Comments
 (0)