Skip to content

Commit

Permalink
Rebase fallout.
Browse files Browse the repository at this point in the history
  • Loading branch information
@cjgillot
cjgillot committed Jun 1, 2023
1 parent 1ad3780 commit d796c60
Show file tree
Hide file tree
Showing 7 changed files with 334 additions and 272 deletions.
135 changes: 63 additions & 72 deletions tests/mir-opt/pre-codegen/chained_comparison.naive.PreCodegen.after.mir
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,26 @@ fn naive(_1: &Blueprint, _2: &Blueprint) -> bool {
let mut _3: u32; // in scope 0 at $DIR/chained_comparison.rs:+1:6: +1:22
let mut _4: u32; // in scope 0 at $DIR/chained_comparison.rs:+1:26: +1:42
let mut _5: bool; // in scope 0 at $DIR/chained_comparison.rs:+1:5: +1:43
let mut _6: bool; // in scope 0 at $DIR/chained_comparison.rs:+1:5: +2:36
let mut _7: u32; // in scope 0 at $DIR/chained_comparison.rs:+2:13: +2:22
let mut _8: u32; // in scope 0 at $DIR/chained_comparison.rs:+2:26: +2:35
let mut _9: bool; // in scope 0 at $DIR/chained_comparison.rs:+2:12: +2:36
let mut _10: bool; // in scope 0 at $DIR/chained_comparison.rs:+1:5: +3:50
let mut _11: u32; // in scope 0 at $DIR/chained_comparison.rs:+3:13: +3:29
let mut _12: u32; // in scope 0 at $DIR/chained_comparison.rs:+3:33: +3:49
let mut _13: bool; // in scope 0 at $DIR/chained_comparison.rs:+3:12: +3:50
let mut _14: bool; // in scope 0 at $DIR/chained_comparison.rs:+1:5: +4:44
let mut _15: u32; // in scope 0 at $DIR/chained_comparison.rs:+4:13: +4:26
let mut _16: u32; // in scope 0 at $DIR/chained_comparison.rs:+4:30: +4:43
let mut _17: bool; // in scope 0 at $DIR/chained_comparison.rs:+4:12: +4:44
let mut _6: u32; // in scope 0 at $DIR/chained_comparison.rs:+2:13: +2:22
let mut _7: u32; // in scope 0 at $DIR/chained_comparison.rs:+2:26: +2:35
let mut _8: bool; // in scope 0 at $DIR/chained_comparison.rs:+2:12: +2:36
let mut _9: bool; // in scope 0 at $DIR/chained_comparison.rs:+1:5: +2:36
let mut _10: u32; // in scope 0 at $DIR/chained_comparison.rs:+3:13: +3:29
let mut _11: u32; // in scope 0 at $DIR/chained_comparison.rs:+3:33: +3:49
let mut _12: bool; // in scope 0 at $DIR/chained_comparison.rs:+3:12: +3:50
let mut _13: bool; // in scope 0 at $DIR/chained_comparison.rs:+1:5: +3:50
let mut _14: u32; // in scope 0 at $DIR/chained_comparison.rs:+4:13: +4:26
let mut _15: u32; // in scope 0 at $DIR/chained_comparison.rs:+4:30: +4:43
let mut _16: bool; // in scope 0 at $DIR/chained_comparison.rs:+4:12: +4:44
let mut _17: bool; // in scope 0 at $DIR/chained_comparison.rs:+1:5: +4:44
let mut _18: u32; // in scope 0 at $DIR/chained_comparison.rs:+5:13: +5:22
let mut _19: u32; // in scope 0 at $DIR/chained_comparison.rs:+5:26: +5:35
let mut _20: bool; // in scope 0 at $DIR/chained_comparison.rs:+5:12: +5:36

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

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

bb2: {
StorageLive(_9); // scope 0 at $DIR/chained_comparison.rs:+2:12: +2:36
StorageLive(_7); // scope 0 at $DIR/chained_comparison.rs:+2:13: +2:22
_7 = ((*_1).1: u32); // scope 0 at $DIR/chained_comparison.rs:+2:13: +2:22
StorageLive(_8); // scope 0 at $DIR/chained_comparison.rs:+2:26: +2:35
_8 = ((*_2).1: u32); // scope 0 at $DIR/chained_comparison.rs:+2:26: +2:35
_9 = Eq(move _7, move _8); // scope 0 at $DIR/chained_comparison.rs:+2:12: +2:36
StorageDead(_8); // scope 0 at $DIR/chained_comparison.rs:+2:35: +2:36
StorageLive(_8); // scope 0 at $DIR/chained_comparison.rs:+2:12: +2:36
StorageLive(_6); // scope 0 at $DIR/chained_comparison.rs:+2:13: +2:22
_6 = ((*_1).1: u32); // scope 0 at $DIR/chained_comparison.rs:+2:13: +2:22
StorageLive(_7); // scope 0 at $DIR/chained_comparison.rs:+2:26: +2:35
_7 = ((*_2).1: u32); // scope 0 at $DIR/chained_comparison.rs:+2:26: +2:35
_8 = Eq(move _6, move _7); // scope 0 at $DIR/chained_comparison.rs:+2:12: +2:36
StorageDead(_7); // scope 0 at $DIR/chained_comparison.rs:+2:35: +2:36
_6 = move _9; // scope 0 at $DIR/chained_comparison.rs:+1:5: +2:36
goto -> bb3; // scope 0 at $DIR/chained_comparison.rs:+1:5: +2:36
StorageDead(_6); // scope 0 at $DIR/chained_comparison.rs:+2:35: +2:36
_9 = move _8; // scope 0 at $DIR/chained_comparison.rs:+1:5: +2:36
StorageDead(_8); // scope 0 at $DIR/chained_comparison.rs:+2:35: +2:36
StorageDead(_5); // scope 0 at $DIR/chained_comparison.rs:+2:35: +2:36
switchInt(move _9) -> [0: bb3, otherwise: bb4]; // scope 0 at $DIR/chained_comparison.rs:+1:5: +3:50
}

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

bb4: {
_10 = const false; // scope 0 at $DIR/chained_comparison.rs:+1:5: +3:50
goto -> bb6; // scope 0 at $DIR/chained_comparison.rs:+1:5: +3:50
StorageLive(_12); // scope 0 at $DIR/chained_comparison.rs:+3:12: +3:50
StorageLive(_10); // scope 0 at $DIR/chained_comparison.rs:+3:13: +3:29
_10 = ((*_1).2: u32); // scope 0 at $DIR/chained_comparison.rs:+3:13: +3:29
StorageLive(_11); // scope 0 at $DIR/chained_comparison.rs:+3:33: +3:49
_11 = ((*_2).2: u32); // scope 0 at $DIR/chained_comparison.rs:+3:33: +3:49
_12 = Eq(move _10, move _11); // scope 0 at $DIR/chained_comparison.rs:+3:12: +3:50
StorageDead(_11); // scope 0 at $DIR/chained_comparison.rs:+3:49: +3:50
StorageDead(_10); // scope 0 at $DIR/chained_comparison.rs:+3:49: +3:50
_13 = move _12; // scope 0 at $DIR/chained_comparison.rs:+1:5: +3:50
StorageDead(_12); // scope 0 at $DIR/chained_comparison.rs:+3:49: +3:50
StorageDead(_9); // scope 0 at $DIR/chained_comparison.rs:+3:49: +3:50
switchInt(move _13) -> [0: bb5, otherwise: bb6]; // scope 0 at $DIR/chained_comparison.rs:+1:5: +4:44
}

bb5: {
StorageLive(_13); // scope 0 at $DIR/chained_comparison.rs:+3:12: +3:50
StorageLive(_11); // scope 0 at $DIR/chained_comparison.rs:+3:13: +3:29
_11 = ((*_1).2: u32); // scope 0 at $DIR/chained_comparison.rs:+3:13: +3:29
StorageLive(_12); // scope 0 at $DIR/chained_comparison.rs:+3:33: +3:49
_12 = ((*_2).2: u32); // scope 0 at $DIR/chained_comparison.rs:+3:33: +3:49
_13 = Eq(move _11, move _12); // scope 0 at $DIR/chained_comparison.rs:+3:12: +3:50
StorageDead(_12); // scope 0 at $DIR/chained_comparison.rs:+3:49: +3:50
StorageDead(_11); // scope 0 at $DIR/chained_comparison.rs:+3:49: +3:50
_10 = move _13; // scope 0 at $DIR/chained_comparison.rs:+1:5: +3:50
goto -> bb6; // scope 0 at $DIR/chained_comparison.rs:+1:5: +3:50
StorageDead(_16); // scope 0 at $DIR/chained_comparison.rs:+4:43: +4:44
StorageDead(_13); // scope 0 at $DIR/chained_comparison.rs:+4:43: +4:44
goto -> bb7; // scope 0 at $DIR/chained_comparison.rs:+1:5: +4:44
}

bb6: {
StorageDead(_13); // scope 0 at $DIR/chained_comparison.rs:+3:49: +3:50
StorageDead(_6); // scope 0 at $DIR/chained_comparison.rs:+3:49: +3:50
switchInt(move _10) -> [0: bb7, otherwise: bb8]; // scope 0 at $DIR/chained_comparison.rs:+1:5: +4:44
}

bb7: {
_14 = const false; // scope 0 at $DIR/chained_comparison.rs:+1:5: +4:44
goto -> bb9; // scope 0 at $DIR/chained_comparison.rs:+1:5: +4:44
}

bb8: {
StorageLive(_17); // scope 0 at $DIR/chained_comparison.rs:+4:12: +4:44
StorageLive(_15); // scope 0 at $DIR/chained_comparison.rs:+4:13: +4:26
_15 = ((*_1).3: u32); // scope 0 at $DIR/chained_comparison.rs:+4:13: +4:26
StorageLive(_16); // scope 0 at $DIR/chained_comparison.rs:+4:30: +4:43
_16 = ((*_2).3: u32); // scope 0 at $DIR/chained_comparison.rs:+4:30: +4:43
_17 = Eq(move _15, move _16); // scope 0 at $DIR/chained_comparison.rs:+4:12: +4:44
StorageDead(_16); // scope 0 at $DIR/chained_comparison.rs:+4:43: +4:44
StorageLive(_16); // scope 0 at $DIR/chained_comparison.rs:+4:12: +4:44
StorageLive(_14); // scope 0 at $DIR/chained_comparison.rs:+4:13: +4:26
_14 = ((*_1).3: u32); // scope 0 at $DIR/chained_comparison.rs:+4:13: +4:26
StorageLive(_15); // scope 0 at $DIR/chained_comparison.rs:+4:30: +4:43
_15 = ((*_2).3: u32); // scope 0 at $DIR/chained_comparison.rs:+4:30: +4:43
_16 = Eq(move _14, move _15); // scope 0 at $DIR/chained_comparison.rs:+4:12: +4:44
StorageDead(_15); // scope 0 at $DIR/chained_comparison.rs:+4:43: +4:44
_14 = move _17; // scope 0 at $DIR/chained_comparison.rs:+1:5: +4:44
goto -> bb9; // scope 0 at $DIR/chained_comparison.rs:+1:5: +4:44
}

bb9: {
StorageDead(_17); // scope 0 at $DIR/chained_comparison.rs:+4:43: +4:44
StorageDead(_10); // scope 0 at $DIR/chained_comparison.rs:+4:43: +4:44
switchInt(move _14) -> [0: bb10, otherwise: bb11]; // scope 0 at $DIR/chained_comparison.rs:+1:5: +5:36
StorageDead(_14); // scope 0 at $DIR/chained_comparison.rs:+4:43: +4:44
_17 = move _16; // scope 0 at $DIR/chained_comparison.rs:+1:5: +4:44
StorageDead(_16); // scope 0 at $DIR/chained_comparison.rs:+4:43: +4:44
StorageDead(_13); // scope 0 at $DIR/chained_comparison.rs:+4:43: +4:44
switchInt(move _17) -> [0: bb7, otherwise: bb8]; // scope 0 at $DIR/chained_comparison.rs:+1:5: +5:36
}

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

bb11: {
bb8: {
StorageLive(_20); // scope 0 at $DIR/chained_comparison.rs:+5:12: +5:36
StorageLive(_18); // scope 0 at $DIR/chained_comparison.rs:+5:13: +5:22
_18 = ((*_1).4: u32); // scope 0 at $DIR/chained_comparison.rs:+5:13: +5:22
Expand All @@ -125,12 +116,12 @@ fn naive(_1: &Blueprint, _2: &Blueprint) -> bool {
StorageDead(_19); // scope 0 at $DIR/chained_comparison.rs:+5:35: +5:36
StorageDead(_18); // scope 0 at $DIR/chained_comparison.rs:+5:35: +5:36
_0 = move _20; // scope 0 at $DIR/chained_comparison.rs:+1:5: +5:36
goto -> bb12; // scope 0 at $DIR/chained_comparison.rs:+1:5: +5:36
goto -> bb9; // scope 0 at $DIR/chained_comparison.rs:+1:5: +5:36
}

bb12: {
bb9: {
StorageDead(_20); // scope 0 at $DIR/chained_comparison.rs:+5:35: +5:36
StorageDead(_14); // scope 0 at $DIR/chained_comparison.rs:+5:35: +5:36
StorageDead(_17); // scope 0 at $DIR/chained_comparison.rs:+5:35: +5:36
return; // scope 0 at $DIR/chained_comparison.rs:+6:2: +6:2
}
}
Loading

0 comments on commit d796c60

Please sign in to comment.