diff --git a/src/test/mir-opt/nll/region-liveness-basic.rs b/src/test/mir-opt/nll/region-liveness-basic.rs deleted file mode 100644 index 187d9e6ca899..000000000000 --- a/src/test/mir-opt/nll/region-liveness-basic.rs +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -// Basic test for liveness constraints: the region (`R1`) that appears -// in the type of `p` includes the points after `&v[0]` up to (but not -// including) the call to `use_x`. The `else` branch is not included. - -// compile-flags:-Zborrowck=mir -Zverbose -// ^^^^^^^^^ force compiler to dump more region information - -#![allow(warnings)] - -fn use_x(_: usize) -> bool { true } - -fn main() { - let mut v = [1, 2, 3]; - let p = &v[0]; - if true { - use_x(*p); - } else { - use_x(22); - } -} - -// END RUST SOURCE -// START rustc.main.nll.0.mir -// | '_#2r | {bb2[0..=1], bb3[0..=1]} -// | '_#3r | {bb2[1], bb3[0..=1]} -// ... -// let _2: &'_#3r usize; -// END rustc.main.nll.0.mir -// START rustc.main.nll.0.mir -// bb2: { -// | Live variables on entry to bb2[0]: [_1, _3] -// _2 = &'_#2r _1[_3]; -// | Live variables on entry to bb2[1]: [_2] -// switchInt(const true) -> [false: bb4, otherwise: bb3]; -// | Live variables on exit from bb2: [_2] -// } -// END rustc.main.nll.0.mir -// START rustc.main.nll.0.mir -// bb3: { -// | Live variables on entry to bb3[0]: [_2] -// StorageLive(_7); -// | Live variables on entry to bb3[1]: [_2] -// _7 = (*_2); -// | Live variables on entry to bb3[2]: [_7] -// _6 = const use_x(move _7) -> [return: bb5, unwind: bb1]; -// | Live variables on exit from bb3: [] -// } -// END rustc.main.nll.0.mir diff --git a/src/test/mir-opt/nll/region-liveness-two-disjoint-uses.rs b/src/test/mir-opt/nll/region-liveness-two-disjoint-uses.rs deleted file mode 100644 index 62064fa94f2f..000000000000 --- a/src/test/mir-opt/nll/region-liveness-two-disjoint-uses.rs +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright 2012-2016 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -// Test for the subregion constraints. In this case, the region R3 on -// `p` includes two disjoint regions of the control-flow graph. The -// borrows in `&v[0]` and `&v[1]` each (in theory) have to outlive R3, -// but only at a particular point, and hence they wind up including -// distinct regions. -// -// FIXME(#43234) -- Well, this used to be true, but we modified NLL -// for the time being to not take location into account. - -// compile-flags:-Zborrowck=mir -Zverbose -// ^^^^^^^^^ force compiler to dump more region information - -#![allow(warnings)] - -fn use_x(_: usize) -> bool { true } - -fn main() { - let mut v = [1, 2, 3]; - let mut p = &v[0]; - if true { - use_x(*p); - } else { - use_x(22); - } - - p = &v[1]; - use_x(*p); -} - -// END RUST SOURCE -// START rustc.main.nll.0.mir -// | '_#2r | {bb2[0..=1], bb3[0..=1], bb8[2..=4]} -// ... -// | '_#4r | {bb2[1], bb3[0..=1], bb8[1..=4]} -// | '_#5r | {bb2[1], bb3[0..=1], bb8[2..=4]} -// ... -// let mut _2: &'_#5r usize; -// ... -// _2 = &'_#2r _1[_3]; -// ... -// _2 = &'_#4r (*_10); -// END rustc.main.nll.0.mir