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

bors · bors · commit 539f2083de80 · 2017-09-13T13:01:42.000Z
Fix end region emission order Fix rust-lang#43481
diff --git a/src/librustc_mir/build/scope.rs b/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];
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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;
 //     }
diff --git 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: 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
diff --git 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: 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
@@ -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: {
diff --git 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,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
diff --git a/src/test/mir-opt/end_region_cyclic.rs b/src/test/mir-opt/end_region_cyclic.rs
@@ -0,0 +1,132 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// compile-flags: -Z identify_regions -Z span_free_formats -Z emit-end-regions
+// ignore-tidy-linelength
+
+// This test models a scenario with a cyclic reference. Rust obviously
+// needs to handle such cases.
+//
+// The interesting part about this test is that such case shows that
+// one cannot generally force all references to be dead before you hit
+// their EndRegion; at least, not without breaking the more important
+// property that all borrowed storage locations have their regions
+// ended strictly before their StorageDeads. (This test was inspired
+// by discussion on Issue #43481.)
+
+use std::cell::Cell;
+
+struct S<'a> {
+    r: Cell<Option<&'a S<'a>>>,
+}
+
+fn main() {
+    loop {
+        let x = S { r: Cell::new(None) };
+        x.r.set(Some(&x));
+        if query() { break; }
+        x.r.set(Some(&x));
+    }
+}
+
+fn query() -> bool { true }
+
+// END RUST SOURCE
+// START rustc.node16.SimplifyCfg-qualify-consts.after.mir
+// fn main() -> () {
+//     let mut _0: ();
+//     scope 1 {
+//         let _2: S<'35_0rs>;
+//     }
+//     let mut _1: ();
+//     let mut _3: std::cell::Cell<std::option::Option<&'35_0rs S<'35_0rs>>>;
+//     let mut _4: std::option::Option<&'35_0rs S<'35_0rs>>;
+//     let mut _5: ();
+//     let mut _6: &'16s std::cell::Cell<std::option::Option<&'35_0rs S<'35_0rs>>>;
+//     let mut _7: std::option::Option<&'35_0rs S<'35_0rs>>;
+//     let mut _8: &'35_0rs S<'35_0rs>;
+//     let mut _9: &'35_0rs S<'35_0rs>;
+//     let mut _10: ();
+//     let mut _11: bool;
+//     let mut _12: !;
+//     let mut _13: ();
+//     let mut _14: &'33s std::cell::Cell<std::option::Option<&'35_0rs S<'35_0rs>>>;
+//     let mut _15: std::option::Option<&'35_0rs S<'35_0rs>>;
+//     let mut _16: &'35_0rs S<'35_0rs>;
+//     let mut _17: &'35_0rs S<'35_0rs>;
+//     bb0: {
+//         goto -> bb1;
+//     }
+//     bb1: {
+//         StorageLive(_2);
+//         StorageLive(_3);
+//         StorageLive(_4);
+//         _4 = std::option::Option<&'35_0rs S<'35_0rs>>::None;
+//         _3 = const <std::cell::Cell<T>>::new(_4) -> bb2;
+//     }
+//     bb2: {
+//         StorageDead(_4);
+//         _2 = S<'35_0rs> { r: _3 };
+//         StorageDead(_3);
+//         StorageLive(_6);
+//         _6 = &'16s (_2.0: std::cell::Cell<std::option::Option<&'35_0rs S<'35_0rs>>>);
+//         StorageLive(_7);
+//         StorageLive(_8);
+//         StorageLive(_9);
+//         _9 = &'35_0rs _2;
+//         _8 = &'35_0rs (*_9);
+//         _7 = std::option::Option<&'35_0rs S<'35_0rs>>::Some(_8,);
+//         StorageDead(_8);
+//         _5 = const <std::cell::Cell<T>>::set(_6, _7) -> bb3;
+//     }
+//     bb3: {
+//         EndRegion('16s);
+//         StorageDead(_7);
+//         StorageDead(_6);
+//         StorageDead(_9);
+//         StorageLive(_11);
+//         _11 = const query() -> bb4;
+//     }
+//     bb4: {
+//         switchInt(_11) -> [0u8: bb6, otherwise: bb5];
+//     }
+//     bb5: {
+//         _0 = ();
+//         StorageDead(_11);
+//         EndRegion('35_0rs);
+//         StorageDead(_2);
+//         return;
+//     }
+//     bb6: {
+//         _10 = ();
+//         StorageDead(_11);
+//         StorageLive(_14);
+//         _14 = &'33s (_2.0: std::cell::Cell<std::option::Option<&'35_0rs S<'35_0rs>>>);
+//         StorageLive(_15);
+//         StorageLive(_16);
+//         StorageLive(_17);
+//         _17 = &'35_0rs _2;
+//         _16 = &'35_0rs (*_17);
+//         _15 = std::option::Option<&'35_0rs S<'35_0rs>>::Some(_16,);
+//         StorageDead(_16);
+//         _13 = const <std::cell::Cell<T>>::set(_14, _15) -> bb7;
+//     }
+//     bb7: {
+//         EndRegion('33s);
+//         StorageDead(_15);
+//         StorageDead(_14);
+//         StorageDead(_17);
+//         _1 = ();
+//         EndRegion('35_0rs);
+//         StorageDead(_2);
+//         goto -> bb1;
+//     }
+// }
+// END rustc.node16.SimplifyCfg-qualify-consts.after.mir
diff --git a/src/test/mir-opt/end_region_destruction_extents_1.rs b/src/test/mir-opt/end_region_destruction_extents_1.rs
diff --git a/src/test/mir-opt/validate_1.rs b/src/test/mir-opt/validate_1.rs
diff --git a/src/test/mir-opt/validate_5.rs b/src/test/mir-opt/validate_5.rs
