diff --git a/src/test/mir-opt/end_region_1.rs b/src/test/mir-opt/end_region_1.rs index 9c8cfc0ab20..1941d1bc7be 100644 --- a/src/test/mir-opt/end_region_1.rs +++ b/src/test/mir-opt/end_region_1.rs @@ -30,8 +30,8 @@ fn main() { // StorageLive(_2); // _2 = &'10_1rs _1; // _0 = (); -// StorageDead(_2); // EndRegion('10_1rs); +// StorageDead(_2); // StorageDead(_1); // return; // } diff --git a/src/test/mir-opt/end_region_2.rs b/src/test/mir-opt/end_region_2.rs index 6a4e209a14b..d8dd4aeadf4 100644 --- a/src/test/mir-opt/end_region_2.rs +++ b/src/test/mir-opt/end_region_2.rs @@ -46,8 +46,8 @@ fn main() { // bb2: { // _0 = (); // StorageDead(_5); -// StorageDead(_3); // EndRegion('23_1rs); +// StorageDead(_3); // StorageDead(_2); // return; // } @@ -56,10 +56,10 @@ fn main() { // StorageLive(_7); // _7 = &'23_3rs _2; // _1 = (); -// StorageDead(_7); // EndRegion('23_3rs); -// StorageDead(_3); +// StorageDead(_7); // EndRegion('23_1rs); +// StorageDead(_3); // StorageDead(_2); // goto -> bb1; // } diff --git a/src/test/mir-opt/end_region_3.rs b/src/test/mir-opt/end_region_3.rs index cb1d45e37c8..e404af838ce 100644 --- a/src/test/mir-opt/end_region_3.rs +++ b/src/test/mir-opt/end_region_3.rs @@ -49,8 +49,8 @@ fn main() { // bb2: { // _0 = (); // StorageDead(_5); -// StorageDead(_3); // EndRegion('26_1rs); +// StorageDead(_3); // StorageDead(_1); // return; // } @@ -60,10 +60,10 @@ fn main() { // StorageLive(_7); // _7 = &'26_3rs _1; // _2 = (); -// StorageDead(_7); // EndRegion('26_3rs); -// StorageDead(_3); +// StorageDead(_7); // EndRegion('26_1rs); +// StorageDead(_3); // goto -> bb1; // } // END rustc.node4.SimplifyCfg-qualify-consts.after.mir diff --git a/src/test/mir-opt/end_region_4.rs b/src/test/mir-opt/end_region_4.rs index b714b6bc55b..d51c627d14b 100644 --- a/src/test/mir-opt/end_region_4.rs +++ b/src/test/mir-opt/end_region_4.rs @@ -53,10 +53,10 @@ fn foo(i: i32) { // StorageLive(_6); // _6 = &'26_4rs _2; // _0 = (); -// StorageDead(_6); // EndRegion('26_4rs); -// StorageDead(_3); +// StorageDead(_6); // EndRegion('26_2rs); +// StorageDead(_3); // StorageDead(_2); // drop(_1) -> bb4; // } diff --git a/src/test/mir-opt/end_region_5.rs b/src/test/mir-opt/end_region_5.rs index a4c53675b9c..6299ec3815c 100644 --- a/src/test/mir-opt/end_region_5.rs +++ b/src/test/mir-opt/end_region_5.rs @@ -44,8 +44,8 @@ fn foo(f: F) where F: FnOnce() -> i32 { // _2 = const foo(_3) -> [return: bb1, unwind: bb3]; // } // bb1: { -// StorageDead(_3); // EndRegion('14s); +// StorageDead(_3); // _0 = (); // drop(_1) -> bb4; // } diff --git a/src/test/mir-opt/end_region_6.rs b/src/test/mir-opt/end_region_6.rs index daa94769430..13ab3e4f2dd 100644 --- a/src/test/mir-opt/end_region_6.rs +++ b/src/test/mir-opt/end_region_6.rs @@ -44,8 +44,8 @@ fn foo(f: F) where F: FnOnce() -> i32 { // _2 = const foo(_3) -> [return: bb1, unwind: bb3]; // } // bb1: { -// StorageDead(_3); // EndRegion('19s); +// StorageDead(_3); // _0 = (); // drop(_1) -> bb4; // } @@ -75,8 +75,8 @@ fn foo(f: F) where F: FnOnce() -> i32 { // _3 = ((*_2).0: i32); // _0 = _3; // StorageDead(_3); -// StorageDead(_2); // EndRegion('15_0rs); +// StorageDead(_2); // return; // } // END rustc.node22.SimplifyCfg-qualify-consts.after.mir diff --git a/src/test/mir-opt/end_region_7.rs b/src/test/mir-opt/end_region_7.rs index 9feacd04fe0..826d3749167 100644 --- a/src/test/mir-opt/end_region_7.rs +++ b/src/test/mir-opt/end_region_7.rs @@ -84,8 +84,8 @@ fn foo(f: F) where F: FnOnce() -> i32 { // _3 = ((*_2).0: i32); // _0 = _3; // StorageDead(_3); -// StorageDead(_2); // EndRegion('15_0rs); +// StorageDead(_2); // drop(_1) -> bb1; // } // bb1: { diff --git a/src/test/mir-opt/end_region_8.rs b/src/test/mir-opt/end_region_8.rs index 30dda7a4062..6438484fcfa 100644 --- a/src/test/mir-opt/end_region_8.rs +++ b/src/test/mir-opt/end_region_8.rs @@ -50,8 +50,8 @@ fn foo(f: F) where F: FnOnce() -> i32 { // bb1: { // StorageDead(_4); // _0 = (); -// StorageDead(_2); // EndRegion('21_1rs); +// StorageDead(_2); // drop(_1) -> bb4; // } // bb2: { diff --git a/src/test/mir-opt/end_region_9.rs b/src/test/mir-opt/end_region_9.rs index bbfdc0e77a8..59d5d934391 100644 --- a/src/test/mir-opt/end_region_9.rs +++ b/src/test/mir-opt/end_region_9.rs @@ -42,7 +42,7 @@ fn main() { // let mut _0: (); // let mut _1: bool; // let _2: i32; -// let mut _4: &'13_0rs i32; +// let mut _4: &'33_0rs i32; // let mut _3: (); // let mut _5: !; // let mut _6: (); @@ -67,15 +67,15 @@ fn main() { // bb2: { // _0 = (); // StorageDead(_7); +// EndRegion('33_0rs); // StorageDead(_4); -// EndRegion('13_0rs); // StorageDead(_2); // StorageDead(_1); // return; // } // // bb3: { -// _4 = &'13_0rs _2; +// _4 = &'33_0rs _2; // _6 = (); // StorageDead(_7); // _1 = const true; @@ -83,3 +83,4 @@ fn main() { // goto -> bb1; // } // } +// END rustc.node4.SimplifyCfg-qualify-consts.after.mir diff --git a/src/test/mir-opt/validate_1.rs b/src/test/mir-opt/validate_1.rs index 842bc8374b6..ec044225b83 100644 --- a/src/test/mir-opt/validate_1.rs +++ b/src/test/mir-opt/validate_1.rs @@ -68,8 +68,8 @@ fn main() { // _5 = (*_4); // _0 = _5; // StorageDead(_5); -// StorageDead(_4); // EndRegion(ReScope(Remainder(BlockRemainder { block: ItemLocalId(22), first_statement_index: 0 }))); +// StorageDead(_4); // StorageDead(_3); // return; // } diff --git a/src/test/mir-opt/validate_5.rs b/src/test/mir-opt/validate_5.rs index 4bebc74ae46..ff0c781d1e3 100644 --- a/src/test/mir-opt/validate_5.rs +++ b/src/test/mir-opt/validate_5.rs @@ -54,8 +54,8 @@ fn main() { // _5 = &ReErased mut (*_3); // Validate(Acquire, [(*_5): i32/ReScope(Node(ItemLocalId(9)))]); // _4 = _5 as *mut i32 (Misc); -// StorageDead(_5); // EndRegion(ReScope(Node(ItemLocalId(9)))); +// StorageDead(_5); // Validate(Release, [_0: bool, _4: *mut i32]); // _0 = const write_42(_4) -> bb1; // }