about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-04-02 13:47:28 +0200
committerGitHub <noreply@github.com>2019-04-02 13:47:28 +0200
commit69bc687f20178076c8fb244cb80d78c2f4c45565 (patch)
tree2e27901d184805ef405eaae64977549700542ece /src/test
parent274f80e4d4c7ed62d724b8d35a620f2ef2100721 (diff)
parent16ee042100d252d1c59c80c797a481be340151b3 (diff)
downloadrust-69bc687f20178076c8fb244cb80d78c2f4c45565.tar.gz
rust-69bc687f20178076c8fb244cb80d78c2f4c45565.zip
Rollup merge of #59585 - rust-lang:shallow-borrow-fixes, r=pnkfelix
Fixes for shallow borrows

* Don't promote these borrows if we're going to remove them before
  codegen
* Correctly mark unreachable code
Diffstat (limited to 'src/test')
-rw-r--r--src/test/mir-opt/match_false_edges.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/mir-opt/match_false_edges.rs b/src/test/mir-opt/match_false_edges.rs
index 0cbf048697a..7ac36a22274 100644
--- a/src/test/mir-opt/match_false_edges.rs
+++ b/src/test/mir-opt/match_false_edges.rs
@@ -70,8 +70,8 @@ fn main() {
 //  }
 //  bb8: { // binding1 and guard
 //      StorageLive(_6);
-//      _6 = &(((promoted[1]: std::option::Option<i32>) as Some).0: i32);
-//      _4 = &shallow (promoted[0]: std::option::Option<i32>);
+//      _6 = &(((promoted[0]: std::option::Option<i32>) as Some).0: i32);
+//      _4 = &shallow _2;
 //      StorageLive(_7);
 //      _7 = const guard() -> [return: bb9, unwind: bb1];
 //  }