Skip to content

Commit d796c60

Browse files
cjgillotcjgillot
committed
Rebase fallout.
1 parent 1ad3780 commit d796c60

7 files changed

+334
-272
lines changed

‎tests/mir-opt/pre-codegen/chained_comparison.naive.PreCodegen.after.mir

+63-72
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@ fn naive(_1: &Blueprint, _2: &Blueprint) -> bool {
77
let mut _3: u32; // in scope 0 at $DIR/chained_comparison.rs:+1:6: +1:22
88
let mut _4: u32; // in scope 0 at $DIR/chained_comparison.rs:+1:26: +1:42
99
let mut _5: bool; // in scope 0 at $DIR/chained_comparison.rs:+1:5: +1:43
10-
let mut _6: bool; // in scope 0 at $DIR/chained_comparison.rs:+1:5: +2:36
11-
let mut _7: u32; // in scope 0 at $DIR/chained_comparison.rs:+2:13: +2:22
12-
let mut _8: u32; // in scope 0 at $DIR/chained_comparison.rs:+2:26: +2:35
13-
let mut _9: bool; // in scope 0 at $DIR/chained_comparison.rs:+2:12: +2:36
14-
let mut _10: bool; // in scope 0 at $DIR/chained_comparison.rs:+1:5: +3:50
15-
let mut _11: u32; // in scope 0 at $DIR/chained_comparison.rs:+3:13: +3:29
16-
let mut _12: u32; // in scope 0 at $DIR/chained_comparison.rs:+3:33: +3:49
17-
let mut _13: bool; // in scope 0 at $DIR/chained_comparison.rs:+3:12: +3:50
18-
let mut _14: bool; // in scope 0 at $DIR/chained_comparison.rs:+1:5: +4:44
19-
let mut _15: u32; // in scope 0 at $DIR/chained_comparison.rs:+4:13: +4:26
20-
let mut _16: u32; // in scope 0 at $DIR/chained_comparison.rs:+4:30: +4:43
21-
let mut _17: bool; // in scope 0 at $DIR/chained_comparison.rs:+4:12: +4:44
10+
let mut _6: u32; // in scope 0 at $DIR/chained_comparison.rs:+2:13: +2:22
11+
let mut _7: u32; // in scope 0 at $DIR/chained_comparison.rs:+2:26: +2:35
12+
let mut _8: bool; // in scope 0 at $DIR/chained_comparison.rs:+2:12: +2:36
13+
let mut _9: bool; // in scope 0 at $DIR/chained_comparison.rs:+1:5: +2:36
14+
let mut _10: u32; // in scope 0 at $DIR/chained_comparison.rs:+3:13: +3:29
15+
let mut _11: u32; // in scope 0 at $DIR/chained_comparison.rs:+3:33: +3:49
16+
let mut _12: bool; // in scope 0 at $DIR/chained_comparison.rs:+3:12: +3:50
17+
let mut _13: bool; // in scope 0 at $DIR/chained_comparison.rs:+1:5: +3:50
18+
let mut _14: u32; // in scope 0 at $DIR/chained_comparison.rs:+4:13: +4:26
19+
let mut _15: u32; // in scope 0 at $DIR/chained_comparison.rs:+4:30: +4:43
20+
let mut _16: bool; // in scope 0 at $DIR/chained_comparison.rs:+4:12: +4:44
21+
let mut _17: bool; // in scope 0 at $DIR/chained_comparison.rs:+1:5: +4:44
2222
let mut _18: u32; // in scope 0 at $DIR/chained_comparison.rs:+5:13: +5:22
2323
let mut _19: u32; // in scope 0 at $DIR/chained_comparison.rs:+5:26: +5:35
2424
let mut _20: bool; // in scope 0 at $DIR/chained_comparison.rs:+5:12: +5:36
2525

2626
bb0: {
27-
StorageLive(_14); // scope 0 at $DIR/chained_comparison.rs:+1:5: +4:44
28-
StorageLive(_10); // scope 0 at $DIR/chained_comparison.rs:+1:5: +3:50
29-
StorageLive(_6); // scope 0 at $DIR/chained_comparison.rs:+1:5: +2:36
27+
StorageLive(_17); // scope 0 at $DIR/chained_comparison.rs:+1:5: +4:44
28+
StorageLive(_13); // scope 0 at $DIR/chained_comparison.rs:+1:5: +3:50
29+
StorageLive(_9); // scope 0 at $DIR/chained_comparison.rs:+1:5: +2:36
3030
StorageLive(_5); // scope 0 at $DIR/chained_comparison.rs:+1:5: +1:43
3131
StorageLive(_3); // scope 0 at $DIR/chained_comparison.rs:+1:6: +1:22
3232
_3 = ((*_1).0: u32); // scope 0 at $DIR/chained_comparison.rs:+1:6: +1:22
@@ -39,83 +39,74 @@ fn naive(_1: &Blueprint, _2: &Blueprint) -> bool {
3939
}
4040

4141
bb1: {
42-
_6 = const false; // scope 0 at $DIR/chained_comparison.rs:+1:5: +2:36
42+
StorageDead(_8); // scope 0 at $DIR/chained_comparison.rs:+2:35: +2:36
43+
StorageDead(_5); // scope 0 at $DIR/chained_comparison.rs:+2:35: +2:36
4344
goto -> bb3; // scope 0 at $DIR/chained_comparison.rs:+1:5: +2:36
4445
}
4546

4647
bb2: {
47-
StorageLive(_9); // scope 0 at $DIR/chained_comparison.rs:+2:12: +2:36
48-
StorageLive(_7); // scope 0 at $DIR/chained_comparison.rs:+2:13: +2:22
49-
_7 = ((*_1).1: u32); // scope 0 at $DIR/chained_comparison.rs:+2:13: +2:22
50-
StorageLive(_8); // scope 0 at $DIR/chained_comparison.rs:+2:26: +2:35
51-
_8 = ((*_2).1: u32); // scope 0 at $DIR/chained_comparison.rs:+2:26: +2:35
52-
_9 = Eq(move _7, move _8); // scope 0 at $DIR/chained_comparison.rs:+2:12: +2:36
53-
StorageDead(_8); // scope 0 at $DIR/chained_comparison.rs:+2:35: +2:36
48+
StorageLive(_8); // scope 0 at $DIR/chained_comparison.rs:+2:12: +2:36
49+
StorageLive(_6); // scope 0 at $DIR/chained_comparison.rs:+2:13: +2:22
50+
_6 = ((*_1).1: u32); // scope 0 at $DIR/chained_comparison.rs:+2:13: +2:22
51+
StorageLive(_7); // scope 0 at $DIR/chained_comparison.rs:+2:26: +2:35
52+
_7 = ((*_2).1: u32); // scope 0 at $DIR/chained_comparison.rs:+2:26: +2:35
53+
_8 = Eq(move _6, move _7); // scope 0 at $DIR/chained_comparison.rs:+2:12: +2:36
5454
StorageDead(_7); // scope 0 at $DIR/chained_comparison.rs:+2:35: +2:36
55-
_6 = move _9; // scope 0 at $DIR/chained_comparison.rs:+1:5: +2:36
56-
goto -> bb3; // scope 0 at $DIR/chained_comparison.rs:+1:5: +2:36
55+
StorageDead(_6); // scope 0 at $DIR/chained_comparison.rs:+2:35: +2:36
56+
_9 = move _8; // scope 0 at $DIR/chained_comparison.rs:+1:5: +2:36
57+
StorageDead(_8); // scope 0 at $DIR/chained_comparison.rs:+2:35: +2:36
58+
StorageDead(_5); // scope 0 at $DIR/chained_comparison.rs:+2:35: +2:36
59+
switchInt(move _9) -> [0: bb3, otherwise: bb4]; // scope 0 at $DIR/chained_comparison.rs:+1:5: +3:50
5760
}
5861

5962
bb3: {
60-
StorageDead(_9); // scope 0 at $DIR/chained_comparison.rs:+2:35: +2:36
61-
StorageDead(_5); // scope 0 at $DIR/chained_comparison.rs:+2:35: +2:36
62-
switchInt(move _6) -> [0: bb4, otherwise: bb5]; // scope 0 at $DIR/chained_comparison.rs:+1:5: +3:50
63+
StorageDead(_12); // scope 0 at $DIR/chained_comparison.rs:+3:49: +3:50
64+
StorageDead(_9); // scope 0 at $DIR/chained_comparison.rs:+3:49: +3:50
65+
goto -> bb5; // scope 0 at $DIR/chained_comparison.rs:+1:5: +3:50
6366
}
6467

6568
bb4: {
66-
_10 = const false; // scope 0 at $DIR/chained_comparison.rs:+1:5: +3:50
67-
goto -> bb6; // scope 0 at $DIR/chained_comparison.rs:+1:5: +3:50
69+
StorageLive(_12); // scope 0 at $DIR/chained_comparison.rs:+3:12: +3:50
70+
StorageLive(_10); // scope 0 at $DIR/chained_comparison.rs:+3:13: +3:29
71+
_10 = ((*_1).2: u32); // scope 0 at $DIR/chained_comparison.rs:+3:13: +3:29
72+
StorageLive(_11); // scope 0 at $DIR/chained_comparison.rs:+3:33: +3:49
73+
_11 = ((*_2).2: u32); // scope 0 at $DIR/chained_comparison.rs:+3:33: +3:49
74+
_12 = Eq(move _10, move _11); // scope 0 at $DIR/chained_comparison.rs:+3:12: +3:50
75+
StorageDead(_11); // scope 0 at $DIR/chained_comparison.rs:+3:49: +3:50
76+
StorageDead(_10); // scope 0 at $DIR/chained_comparison.rs:+3:49: +3:50
77+
_13 = move _12; // scope 0 at $DIR/chained_comparison.rs:+1:5: +3:50
78+
StorageDead(_12); // scope 0 at $DIR/chained_comparison.rs:+3:49: +3:50
79+
StorageDead(_9); // scope 0 at $DIR/chained_comparison.rs:+3:49: +3:50
80+
switchInt(move _13) -> [0: bb5, otherwise: bb6]; // scope 0 at $DIR/chained_comparison.rs:+1:5: +4:44
6881
}
6982

7083
bb5: {
71-
StorageLive(_13); // scope 0 at $DIR/chained_comparison.rs:+3:12: +3:50
72-
StorageLive(_11); // scope 0 at $DIR/chained_comparison.rs:+3:13: +3:29
73-
_11 = ((*_1).2: u32); // scope 0 at $DIR/chained_comparison.rs:+3:13: +3:29
74-
StorageLive(_12); // scope 0 at $DIR/chained_comparison.rs:+3:33: +3:49
75-
_12 = ((*_2).2: u32); // scope 0 at $DIR/chained_comparison.rs:+3:33: +3:49
76-
_13 = Eq(move _11, move _12); // scope 0 at $DIR/chained_comparison.rs:+3:12: +3:50
77-
StorageDead(_12); // scope 0 at $DIR/chained_comparison.rs:+3:49: +3:50
78-
StorageDead(_11); // scope 0 at $DIR/chained_comparison.rs:+3:49: +3:50
79-
_10 = move _13; // scope 0 at $DIR/chained_comparison.rs:+1:5: +3:50
80-
goto -> bb6; // scope 0 at $DIR/chained_comparison.rs:+1:5: +3:50
84+
StorageDead(_16); // scope 0 at $DIR/chained_comparison.rs:+4:43: +4:44
85+
StorageDead(_13); // scope 0 at $DIR/chained_comparison.rs:+4:43: +4:44
86+
goto -> bb7; // scope 0 at $DIR/chained_comparison.rs:+1:5: +4:44
8187
}
8288

8389
bb6: {
84-
StorageDead(_13); // scope 0 at $DIR/chained_comparison.rs:+3:49: +3:50
85-
StorageDead(_6); // scope 0 at $DIR/chained_comparison.rs:+3:49: +3:50
86-
switchInt(move _10) -> [0: bb7, otherwise: bb8]; // scope 0 at $DIR/chained_comparison.rs:+1:5: +4:44
87-
}
88-
89-
bb7: {
90-
_14 = const false; // scope 0 at $DIR/chained_comparison.rs:+1:5: +4:44
91-
goto -> bb9; // scope 0 at $DIR/chained_comparison.rs:+1:5: +4:44
92-
}
93-
94-
bb8: {
95-
StorageLive(_17); // scope 0 at $DIR/chained_comparison.rs:+4:12: +4:44
96-
StorageLive(_15); // scope 0 at $DIR/chained_comparison.rs:+4:13: +4:26
97-
_15 = ((*_1).3: u32); // scope 0 at $DIR/chained_comparison.rs:+4:13: +4:26
98-
StorageLive(_16); // scope 0 at $DIR/chained_comparison.rs:+4:30: +4:43
99-
_16 = ((*_2).3: u32); // scope 0 at $DIR/chained_comparison.rs:+4:30: +4:43
100-
_17 = Eq(move _15, move _16); // scope 0 at $DIR/chained_comparison.rs:+4:12: +4:44
101-
StorageDead(_16); // scope 0 at $DIR/chained_comparison.rs:+4:43: +4:44
90+
StorageLive(_16); // scope 0 at $DIR/chained_comparison.rs:+4:12: +4:44
91+
StorageLive(_14); // scope 0 at $DIR/chained_comparison.rs:+4:13: +4:26
92+
_14 = ((*_1).3: u32); // scope 0 at $DIR/chained_comparison.rs:+4:13: +4:26
93+
StorageLive(_15); // scope 0 at $DIR/chained_comparison.rs:+4:30: +4:43
94+
_15 = ((*_2).3: u32); // scope 0 at $DIR/chained_comparison.rs:+4:30: +4:43
95+
_16 = Eq(move _14, move _15); // scope 0 at $DIR/chained_comparison.rs:+4:12: +4:44
10296
StorageDead(_15); // scope 0 at $DIR/chained_comparison.rs:+4:43: +4:44
103-
_14 = move _17; // scope 0 at $DIR/chained_comparison.rs:+1:5: +4:44
104-
goto -> bb9; // scope 0 at $DIR/chained_comparison.rs:+1:5: +4:44
105-
}
106-
107-
bb9: {
108-
StorageDead(_17); // scope 0 at $DIR/chained_comparison.rs:+4:43: +4:44
109-
StorageDead(_10); // scope 0 at $DIR/chained_comparison.rs:+4:43: +4:44
110-
switchInt(move _14) -> [0: bb10, otherwise: bb11]; // scope 0 at $DIR/chained_comparison.rs:+1:5: +5:36
97+
StorageDead(_14); // scope 0 at $DIR/chained_comparison.rs:+4:43: +4:44
98+
_17 = move _16; // scope 0 at $DIR/chained_comparison.rs:+1:5: +4:44
99+
StorageDead(_16); // scope 0 at $DIR/chained_comparison.rs:+4:43: +4:44
100+
StorageDead(_13); // scope 0 at $DIR/chained_comparison.rs:+4:43: +4:44
101+
switchInt(move _17) -> [0: bb7, otherwise: bb8]; // scope 0 at $DIR/chained_comparison.rs:+1:5: +5:36
111102
}
112103

113-
bb10: {
104+
bb7: {
114105
_0 = const false; // scope 0 at $DIR/chained_comparison.rs:+1:5: +5:36
115-
goto -> bb12; // scope 0 at $DIR/chained_comparison.rs:+1:5: +5:36
106+
goto -> bb9; // scope 0 at $DIR/chained_comparison.rs:+1:5: +5:36
116107
}
117108

118-
bb11: {
109+
bb8: {
119110
StorageLive(_20); // scope 0 at $DIR/chained_comparison.rs:+5:12: +5:36
120111
StorageLive(_18); // scope 0 at $DIR/chained_comparison.rs:+5:13: +5:22
121112
_18 = ((*_1).4: u32); // scope 0 at $DIR/chained_comparison.rs:+5:13: +5:22
@@ -125,12 +116,12 @@ fn naive(_1: &Blueprint, _2: &Blueprint) -> bool {
125116
StorageDead(_19); // scope 0 at $DIR/chained_comparison.rs:+5:35: +5:36
126117
StorageDead(_18); // scope 0 at $DIR/chained_comparison.rs:+5:35: +5:36
127118
_0 = move _20; // scope 0 at $DIR/chained_comparison.rs:+1:5: +5:36
128-
goto -> bb12; // scope 0 at $DIR/chained_comparison.rs:+1:5: +5:36
119+
goto -> bb9; // scope 0 at $DIR/chained_comparison.rs:+1:5: +5:36
129120
}
130121

131-
bb12: {
122+
bb9: {
132123
StorageDead(_20); // scope 0 at $DIR/chained_comparison.rs:+5:35: +5:36
133-
StorageDead(_14); // scope 0 at $DIR/chained_comparison.rs:+5:35: +5:36
124+
StorageDead(_17); // scope 0 at $DIR/chained_comparison.rs:+5:35: +5:36
134125
return; // scope 0 at $DIR/chained_comparison.rs:+6:2: +6:2
135126
}
136127
}

0 commit comments

Comments
 (0)