Skip to content

Commit 51ef82d

Browse files
cjgillotcjgillot
committed
Bless 32bit tests.
1 parent 2985618 commit 51ef82d

4 files changed

+21
-19
lines changed

‎tests/mir-opt/const_prop/optimizes_into_variable.main.ConstProp.32bit.diff

+3-9
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
let _5: usize; // in scope 0 at $DIR/optimizes_into_variable.rs:+2:32: +2:33
1010
let mut _6: usize; // in scope 0 at $DIR/optimizes_into_variable.rs:+2:13: +2:34
1111
let mut _7: bool; // in scope 0 at $DIR/optimizes_into_variable.rs:+2:13: +2:34
12-
let mut _9: Point; // in scope 0 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
12+
let mut _9: u32; // in scope 0 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
1313
scope 1 {
1414
debug x => _1; // in scope 1 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
1515
let _3: i32; // in scope 1 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
1616
scope 2 {
1717
debug y => _3; // in scope 2 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
1818
let _8: u32; // in scope 2 at $DIR/optimizes_into_variable.rs:+3:9: +3:10
1919
scope 3 {
20-
debug z => _8; // in scope 3 at $DIR/optimizes_into_variable.rs:+3:9: +3:10
20+
debug z => _9; // in scope 3 at $DIR/optimizes_into_variable.rs:+3:9: +3:10
2121
}
2222
}
2323
}
@@ -50,13 +50,7 @@
5050
+ _3 = const 3_i32; // scope 1 at $DIR/optimizes_into_variable.rs:+2:13: +2:34
5151
StorageDead(_5); // scope 1 at $DIR/optimizes_into_variable.rs:+2:34: +2:35
5252
StorageDead(_4); // scope 1 at $DIR/optimizes_into_variable.rs:+2:34: +2:35
53-
StorageLive(_8); // scope 2 at $DIR/optimizes_into_variable.rs:+3:9: +3:10
54-
StorageLive(_9); // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
55-
_9 = Point { x: const 12_u32, y: const 42_u32 }; // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
56-
- _8 = (_9.1: u32); // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:38
57-
+ _8 = const 42_u32; // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:38
58-
StorageDead(_9); // scope 2 at $DIR/optimizes_into_variable.rs:+3:38: +3:39
59-
StorageDead(_8); // scope 2 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
53+
_9 = const 42_u32; // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
6054
StorageDead(_3); // scope 1 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
6155
StorageDead(_1); // scope 0 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
6256
return; // scope 0 at $DIR/optimizes_into_variable.rs:+4:2: +4:2

‎tests/mir-opt/const_prop/optimizes_into_variable.main.PreCodegen.after.32bit.mir

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
fn main() -> () {
44
let mut _0: (); // return place in scope 0 at $DIR/optimizes_into_variable.rs:+0:11: +0:11
55
let _1: i32; // in scope 0 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
6+
let mut _3: u32; // in scope 0 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
67
scope 1 {
78
debug x => _1; // in scope 1 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
89
let _2: i32; // in scope 1 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
910
scope 2 {
1011
debug y => _2; // in scope 2 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
11-
let _3: u32; // in scope 2 at $DIR/optimizes_into_variable.rs:+3:9: +3:10
1212
scope 3 {
1313
debug z => _3; // in scope 3 at $DIR/optimizes_into_variable.rs:+3:9: +3:10
1414
}
@@ -18,8 +18,6 @@ fn main() -> () {
1818
bb0: {
1919
StorageLive(_1); // scope 0 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
2020
StorageLive(_2); // scope 1 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
21-
StorageLive(_3); // scope 2 at $DIR/optimizes_into_variable.rs:+3:9: +3:10
22-
StorageDead(_3); // scope 2 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
2321
StorageDead(_2); // scope 1 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
2422
StorageDead(_1); // scope 0 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
2523
return; // scope 0 at $DIR/optimizes_into_variable.rs:+4:2: +4:2

‎tests/mir-opt/const_prop/optimizes_into_variable.main.ScalarReplacementOfAggregates.32bit.diff

+16-4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
let mut _6: usize; // in scope 0 at $DIR/optimizes_into_variable.rs:+2:13: +2:34
1111
let mut _7: bool; // in scope 0 at $DIR/optimizes_into_variable.rs:+2:13: +2:34
1212
let mut _9: Point; // in scope 0 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
13+
+ let mut _10: u32; // in scope 0 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
14+
+ let mut _11: u32; // in scope 0 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
1315
scope 1 {
1416
debug x => _1; // in scope 1 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
1517
let _3: i32; // in scope 1 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
@@ -45,10 +47,20 @@
4547
StorageDead(_5); // scope 1 at $DIR/optimizes_into_variable.rs:+2:34: +2:35
4648
StorageDead(_4); // scope 1 at $DIR/optimizes_into_variable.rs:+2:34: +2:35
4749
StorageLive(_8); // scope 2 at $DIR/optimizes_into_variable.rs:+3:9: +3:10
48-
StorageLive(_9); // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
49-
_9 = Point { x: const 12_u32, y: const 42_u32 }; // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
50-
_8 = (_9.1: u32); // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:38
51-
StorageDead(_9); // scope 2 at $DIR/optimizes_into_variable.rs:+3:38: +3:39
50+
- StorageLive(_9); // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
51+
- _9 = Point { x: const 12_u32, y: const 42_u32 }; // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
52+
- _8 = (_9.1: u32); // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:38
53+
- StorageDead(_9); // scope 2 at $DIR/optimizes_into_variable.rs:+3:38: +3:39
54+
+ StorageLive(_10); // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
55+
+ StorageLive(_11); // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
56+
+ nop; // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
57+
+ _10 = const 12_u32; // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
58+
+ _11 = const 42_u32; // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
59+
+ nop; // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
60+
+ _8 = _11; // scope 2 at $DIR/optimizes_into_variable.rs:+3:13: +3:38
61+
+ StorageDead(_10); // scope 2 at $DIR/optimizes_into_variable.rs:+3:38: +3:39
62+
+ StorageDead(_11); // scope 2 at $DIR/optimizes_into_variable.rs:+3:38: +3:39
63+
+ nop; // scope 2 at $DIR/optimizes_into_variable.rs:+3:38: +3:39
5264
nop; // scope 0 at $DIR/optimizes_into_variable.rs:+0:11: +4:2
5365
StorageDead(_8); // scope 2 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
5466
StorageDead(_3); // scope 1 at $DIR/optimizes_into_variable.rs:+4:1: +4:2

‎tests/mir-opt/const_prop/optimizes_into_variable.main.SimplifyLocals-final.after.32bit.mir

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
fn main() -> () {
44
let mut _0: (); // return place in scope 0 at $DIR/optimizes_into_variable.rs:+0:11: +0:11
55
let _1: i32; // in scope 0 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
6+
let mut _3: u32; // in scope 0 at $DIR/optimizes_into_variable.rs:+3:13: +3:36
67
scope 1 {
78
debug x => _1; // in scope 1 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
89
let _2: i32; // in scope 1 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
910
scope 2 {
1011
debug y => _2; // in scope 2 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
11-
let _3: u32; // in scope 2 at $DIR/optimizes_into_variable.rs:+3:9: +3:10
1212
scope 3 {
1313
debug z => _3; // in scope 3 at $DIR/optimizes_into_variable.rs:+3:9: +3:10
1414
}
@@ -18,8 +18,6 @@ fn main() -> () {
1818
bb0: {
1919
StorageLive(_1); // scope 0 at $DIR/optimizes_into_variable.rs:+1:9: +1:10
2020
StorageLive(_2); // scope 1 at $DIR/optimizes_into_variable.rs:+2:9: +2:10
21-
StorageLive(_3); // scope 2 at $DIR/optimizes_into_variable.rs:+3:9: +3:10
22-
StorageDead(_3); // scope 2 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
2321
StorageDead(_2); // scope 1 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
2422
StorageDead(_1); // scope 0 at $DIR/optimizes_into_variable.rs:+4:1: +4:2
2523
return; // scope 0 at $DIR/optimizes_into_variable.rs:+4:2: +4:2

0 commit comments

Comments
 (0)