about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Schneider <github35764891676564198441@oli-obk.de>2018-07-22 14:53:35 +0200
committerOliver Schneider <github35764891676564198441@oli-obk.de>2018-07-23 09:51:31 +0200
commitcbd42749efa3555b51463497869af9f829480142 (patch)
treee3bf047451fe37ba4f00f4e5d2d7956dff7e29a4
parentbe92f9d3d65b9d50689ead4a4a3a9d65b07e0b91 (diff)
downloadrust-cbd42749efa3555b51463497869af9f829480142.tar.gz
rust-cbd42749efa3555b51463497869af9f829480142.zip
Update mir-opt to promoted changes
-rw-r--r--src/test/mir-opt/end_region_destruction_extents_1.rs8
-rw-r--r--src/test/mir-opt/match_false_edges.rs6
2 files changed, 4 insertions, 10 deletions
diff --git a/src/test/mir-opt/end_region_destruction_extents_1.rs b/src/test/mir-opt/end_region_destruction_extents_1.rs
index fab2f9eff5a..8f8c406bcb3 100644
--- a/src/test/mir-opt/end_region_destruction_extents_1.rs
+++ b/src/test/mir-opt/end_region_destruction_extents_1.rs
@@ -122,19 +122,15 @@ unsafe impl<'a, #[may_dangle] 'b> Drop for D1<'a, 'b> {
 //     let mut _6: &'10s S1;
 //     let mut _7: &'10s S1;
 //     let mut _8: S1;
-//     let mut _9: &'10s S1;
-//     let mut _10: &'12ds S1;
 //     bb0: {
 //         StorageLive(_2);
 //         StorageLive(_3);
 //         StorageLive(_4);
-//         _10 = promoted[1];
-//         _4 = &'12ds (*_10);
+//         _4 = &'12ds (promoted[1]: S1);
 //         _3 = &'12ds (*_4);
 //         StorageLive(_6);
 //         StorageLive(_7);
-//         _9 = promoted[0];
-//         _7 = &'10s (*_9);
+//         _7 = &'10s (promoted[0]: S1);
 //         _6 = &'10s (*_7);
 //         _2 = D1<'12ds, '10s>::{{constructor}}(move _3, move _6);
 //         EndRegion('10s);
diff --git a/src/test/mir-opt/match_false_edges.rs b/src/test/mir-opt/match_false_edges.rs
index 739cbc0a996..43e711ca902 100644
--- a/src/test/mir-opt/match_false_edges.rs
+++ b/src/test/mir-opt/match_false_edges.rs
@@ -54,8 +54,7 @@ fn main() {
 //      ...
 //      _2 = std::option::Option<i32>::Some(const 42i32,);
 //      _3 = discriminant(_2);
-//      _14 = promoted[1];
-//      _4 = &(*_14);
+//      _4 = &(promoted[1]: std::option::Option<i32>);
 //      _9 = discriminant(_2);
 //      switchInt(move _9) -> [0isize: bb5, 1isize: bb3, otherwise: bb7];
 //  }
@@ -86,8 +85,7 @@ fn main() {
 //  }
 //  bb8: { // binding1 and guard
 //      StorageLive(_7);
-//      _13 = promoted[0];
-//      _7 = &(((*_13) as Some).0: i32);
+//      _7 = &(((promoted[0]: std::option::Option<i32>) as Some).0: i32);
 //      StorageLive(_10);
 //      _10 = const guard() -> [return: bb9, unwind: bb1];
 //  }