b3a47d9b6b
This commit desugars the drop and replace deriving from an assignment at MIR build, avoiding the construction of the DropAndReplace terminator (which will be removed in a followign PR) In order to retain the same error messages for replaces a new DesugaringKind::Replace variant is introduced.
102 lines
5.2 KiB
Diff
102 lines
5.2 KiB
Diff
- // MIR for `test` before ElaborateDrops
|
|
+ // MIR for `test` after ElaborateDrops
|
|
|
|
fn test() -> () {
|
|
let mut _0: (); // return place in scope 0 at $DIR/issue_41110.rs:+0:15: +0:15
|
|
let _1: S; // in scope 0 at $DIR/issue_41110.rs:+1:9: +1:10
|
|
let _3: (); // in scope 0 at $DIR/issue_41110.rs:+3:5: +3:12
|
|
let mut _4: S; // in scope 0 at $DIR/issue_41110.rs:+3:10: +3:11
|
|
let mut _5: S; // in scope 0 at $DIR/issue_41110.rs:+4:9: +4:10
|
|
+ let mut _6: bool; // in scope 0 at $DIR/issue_41110.rs:+5:1: +5:2
|
|
scope 1 {
|
|
debug u => _1; // in scope 1 at $DIR/issue_41110.rs:+1:9: +1:10
|
|
let mut _2: S; // in scope 1 at $DIR/issue_41110.rs:+2:9: +2:14
|
|
scope 2 {
|
|
debug v => _2; // in scope 2 at $DIR/issue_41110.rs:+2:9: +2:14
|
|
}
|
|
}
|
|
|
|
bb0: {
|
|
+ _6 = const false; // scope 0 at $DIR/issue_41110.rs:+1:9: +1:10
|
|
StorageLive(_1); // scope 0 at $DIR/issue_41110.rs:+1:9: +1:10
|
|
+ _6 = const true; // scope 0 at $DIR/issue_41110.rs:+1:13: +1:14
|
|
_1 = S; // scope 0 at $DIR/issue_41110.rs:+1:13: +1:14
|
|
StorageLive(_2); // scope 1 at $DIR/issue_41110.rs:+2:9: +2:14
|
|
_2 = S; // scope 1 at $DIR/issue_41110.rs:+2:17: +2:18
|
|
StorageLive(_3); // scope 2 at $DIR/issue_41110.rs:+3:5: +3:12
|
|
StorageLive(_4); // scope 2 at $DIR/issue_41110.rs:+3:10: +3:11
|
|
_4 = move _2; // scope 2 at $DIR/issue_41110.rs:+3:10: +3:11
|
|
_3 = std::mem::drop::<S>(move _4) -> [return: bb1, unwind: bb7]; // scope 2 at $DIR/issue_41110.rs:+3:5: +3:12
|
|
// mir::Constant
|
|
// + span: $DIR/issue_41110.rs:17:5: 17:9
|
|
// + literal: Const { ty: fn(S) {std::mem::drop::<S>}, val: Value(<ZST>) }
|
|
}
|
|
|
|
bb1: {
|
|
StorageDead(_4); // scope 2 at $DIR/issue_41110.rs:+3:11: +3:12
|
|
StorageDead(_3); // scope 2 at $DIR/issue_41110.rs:+3:12: +3:13
|
|
StorageLive(_5); // scope 2 at $DIR/issue_41110.rs:+4:9: +4:10
|
|
+ _6 = const false; // scope 2 at $DIR/issue_41110.rs:+4:9: +4:10
|
|
_5 = move _1; // scope 2 at $DIR/issue_41110.rs:+4:9: +4:10
|
|
- drop(_2) -> [return: bb2, unwind: bb3]; // scope 2 at $DIR/issue_41110.rs:+4:5: +4:6
|
|
+ goto -> bb2; // scope 2 at $DIR/issue_41110.rs:+4:5: +4:6
|
|
}
|
|
|
|
bb2: {
|
|
_2 = move _5; // scope 2 at $DIR/issue_41110.rs:+4:5: +4:6
|
|
- drop(_5) -> [return: bb4, unwind: bb8]; // scope 2 at $DIR/issue_41110.rs:+4:9: +4:10
|
|
+ goto -> bb4; // scope 2 at $DIR/issue_41110.rs:+4:9: +4:10
|
|
}
|
|
|
|
bb3 (cleanup): {
|
|
_2 = move _5; // scope 2 at $DIR/issue_41110.rs:+4:5: +4:6
|
|
drop(_5) -> bb8; // scope 2 at $DIR/issue_41110.rs:+4:9: +4:10
|
|
}
|
|
|
|
bb4: {
|
|
StorageDead(_5); // scope 2 at $DIR/issue_41110.rs:+4:9: +4:10
|
|
_0 = const (); // scope 0 at $DIR/issue_41110.rs:+0:15: +5:2
|
|
drop(_2) -> [return: bb5, unwind: bb9]; // scope 1 at $DIR/issue_41110.rs:+5:1: +5:2
|
|
}
|
|
|
|
bb5: {
|
|
StorageDead(_2); // scope 1 at $DIR/issue_41110.rs:+5:1: +5:2
|
|
- drop(_1) -> bb6; // scope 0 at $DIR/issue_41110.rs:+5:1: +5:2
|
|
+ goto -> bb6; // scope 0 at $DIR/issue_41110.rs:+5:1: +5:2
|
|
}
|
|
|
|
bb6: {
|
|
+ _6 = const false; // scope 0 at $DIR/issue_41110.rs:+5:1: +5:2
|
|
StorageDead(_1); // scope 0 at $DIR/issue_41110.rs:+5:1: +5:2
|
|
return; // scope 0 at $DIR/issue_41110.rs:+5:2: +5:2
|
|
}
|
|
|
|
bb7 (cleanup): {
|
|
- drop(_4) -> bb8; // scope 2 at $DIR/issue_41110.rs:+3:11: +3:12
|
|
+ goto -> bb8; // scope 2 at $DIR/issue_41110.rs:+3:11: +3:12
|
|
}
|
|
|
|
bb8 (cleanup): {
|
|
- drop(_2) -> bb9; // scope 1 at $DIR/issue_41110.rs:+5:1: +5:2
|
|
+ goto -> bb9; // scope 1 at $DIR/issue_41110.rs:+5:1: +5:2
|
|
}
|
|
|
|
bb9 (cleanup): {
|
|
- drop(_1) -> bb10; // scope 0 at $DIR/issue_41110.rs:+5:1: +5:2
|
|
+ goto -> bb12; // scope 0 at $DIR/issue_41110.rs:+5:1: +5:2
|
|
}
|
|
|
|
bb10 (cleanup): {
|
|
resume; // scope 0 at $DIR/issue_41110.rs:+0:1: +5:2
|
|
+ }
|
|
+
|
|
+ bb11 (cleanup): {
|
|
+ drop(_1) -> bb10; // scope 0 at $DIR/issue_41110.rs:+5:1: +5:2
|
|
+ }
|
|
+
|
|
+ bb12 (cleanup): {
|
|
+ switchInt(_6) -> [0: bb10, otherwise: bb11]; // scope 0 at $DIR/issue_41110.rs:+5:1: +5:2
|
|
}
|
|
}
|
|
|