about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2018-05-10 17:14:51 -0400
committerNiko Matsakis <niko@alum.mit.edu>2018-05-10 17:14:51 -0400
commita64ef13a061b198d2a2d3bb26c7c622d7931b2c3 (patch)
tree8dea814268c3e56005d239c7b34e10fe42a301f6
parent7ec8e51a9f8ef2264d96a1bac468501aaa7e16c2 (diff)
downloadrust-a64ef13a061b198d2a2d3bb26c7c622d7931b2c3.tar.gz
rust-a64ef13a061b198d2a2d3bb26c7c622d7931b2c3.zip
"fix" test region-liveness-two-disjoint-uses
We no longer get two disjoint uses. =)
-rw-r--r--src/test/mir-opt/nll/region-liveness-two-disjoint-uses.rs7
1 files changed, 5 insertions, 2 deletions
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
index 153739133ac..62064fa94f2 100644
--- a/src/test/mir-opt/nll/region-liveness-two-disjoint-uses.rs
+++ b/src/test/mir-opt/nll/region-liveness-two-disjoint-uses.rs
@@ -13,6 +13,9 @@
 // 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
@@ -36,9 +39,9 @@ fn main() {
 
 // END RUST SOURCE
 // START rustc.main.nll.0.mir
-// | '_#2r    | {bb2[0..=1], bb3[0..=1]}
+// | '_#2r    | {bb2[0..=1], bb3[0..=1], bb8[2..=4]}
 // ...
-// | '_#4r    | {bb8[1..=4]}
+// | '_#4r    | {bb2[1], bb3[0..=1], bb8[1..=4]}
 // | '_#5r    | {bb2[1], bb3[0..=1], bb8[2..=4]}
 // ...
 // let mut _2: &'_#5r usize;