Auto merge of #44129 - pnkfelix:fix-end-region-emission-order, r=nmatsakis

Fix end region emission order Fix #43481

Author: bors

src/librustc_mir/build/scope.rs

@@ -352,14 +352,15 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> {
  }
  let scope = self.scopes.pop().unwrap();
  assert_eq!(scope.region_scope, region_scope.0);
+
+ self.cfg.push_end_region(self.hir.tcx(), block, region_scope.1, scope.region_scope);
  unpack!(block = build_scope_drops(&mut self.cfg,
  &scope,
  &self.scopes,
  block,
  self.arg_count,
  false));
 
- self.cfg.push_end_region(self.hir.tcx(), block, region_scope.1, scope.region_scope);
  block.unit()
  }
 
@@ -406,15 +407,16 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> {
  scope.cached_exits.insert((target, region_scope.0), b);
  b
  };
+
+ // End all regions for scopes out of which we are breaking.
+ self.cfg.push_end_region(self.hir.tcx(), block, region_scope.1, scope.region_scope);
+
  unpack!(block = build_scope_drops(&mut self.cfg,
  scope,
  rest,
  block,
  self.arg_count,
  false));
-
- // End all regions for scopes out of which we are breaking.
- self.cfg.push_end_region(self.hir.tcx(), block, region_scope.1, scope.region_scope);
  }
  }
  let scope = &self.scopes[len - scope_count];

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;
 // }

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;
 // }

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

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;
 // }

src/test/mir-opt/end_region_5.rs

@@ -44,8 +44,8 @@ fn foo<F>(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;
 // }

src/test/mir-opt/end_region_6.rs

@@ -44,8 +44,8 @@ fn foo<F>(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: 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

src/test/mir-opt/end_region_7.rs

@@ -84,8 +84,8 @@ fn foo<F>(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: {

src/test/mir-opt/end_region_8.rs

@@ -50,8 +50,8 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
 // bb1: {
 // StorageDead(_4);
 // _0 = ();
-// StorageDead(_2);
 // EndRegion('21_1rs);
+// StorageDead(_2);
 // drop(_1) -> bb4;
 // }
 // bb2: {

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,19 +67,20 @@ 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;
 // _3 = ();
 // goto -> bb1;
 // }
 // }
+// END rustc.node4.SimplifyCfg-qualify-consts.after.mir