change MIR dump filenames from `nodeN` to `DefPath`

diff --git a/src/librustc/hir/map/definitions.rs b/src/librustc/hir/map/definitions.rs
index b30cc0b09c9ac6c316cdea2ba34e49ff46cf3c0d..cdf0800a0e4e9c00cfb3e1a3d0d5e7a68f3e88a8 100644 (file)
--- a/src/librustc/hir/map/definitions.rs
+++ b/src/librustc/hir/map/definitions.rs
@@ -314,6 +314,26 @@ pub fn to_string_no_crate(&self) -> String {
 
         s
     }
+
+    /// Return filename friendly string of the DefPah without
+    /// the crate-prefix. This method is useful if you don't have
+    /// a TyCtxt available.
+    pub fn to_filename_friendly_no_crate(&self) -> String {
+        let mut s = String::with_capacity(self.data.len() * 16);
+
+        for component in &self.data {
+            if component.disambiguator == 0 {
+                write!(s, ".{}", component.data.as_interned_str()).unwrap();
+            } else {
+                write!(s,
+                       ".{}[{}]",
+                       component.data.as_interned_str(),
+                       component.disambiguator)
+                    .unwrap();
+            }
+        }
+        s
+    }
 }
 
 #[derive(Clone, Debug, Eq, PartialEq, Hash, RustcEncodable, RustcDecodable)]

diff --git a/src/librustc_mir/util/pretty.rs b/src/librustc_mir/util/pretty.rs
index 1d924175b2167dca4fd27ca849a2322b00f42059..546217b2e035c011ab34ec9bbc570c300ef7281e 100644 (file)
--- a/src/librustc_mir/util/pretty.rs
+++ b/src/librustc_mir/util/pretty.rs
@@ -132,9 +132,12 @@ fn dump_matched_mir_node<'a, 'gcx, 'tcx, F>(tcx: TyCtxt<'a, 'gcx, 'tcx>,
         let p = Path::new(file_dir);
         file_path.push(p);
     };
+
     let _ = fs::create_dir_all(&file_path);
-    let file_name = format!("rustc.node{}{}{}.{}.{}.mir",
-                            source.item_id(), promotion_id, pass_num, pass_name, disambiguator);
+    let function_name  = tcx.hir.def_path_from_id(source.item_id())
+        .map(|d| d.to_filename_friendly_no_crate()) .unwrap_or(format!(".node{}", source.item_id()));
+    let file_name = format!("rustc{}{}{}.{}.{}.mir",
+                            function_name, promotion_id, pass_num, pass_name, disambiguator);
     file_path.push(&file_name);
     let _ = fs::File::create(&file_path).and_then(|mut file| {
         writeln!(file, "// MIR for `{}`", node_path)?;

diff --git a/src/test/mir-opt/basic_assignment.rs b/src/test/mir-opt/basic_assignment.rs
index d3bf7f68785d568d93e28654985d735bd7331d5e..e7263b4739452a9e1fb7fca8ef639cdd64cfbd40 100644 (file)
--- a/src/test/mir-opt/basic_assignment.rs
+++ b/src/test/mir-opt/basic_assignment.rs
@@ -36,7 +36,7 @@ fn main() {
 }
 
 // END RUST SOURCE
-// START rustc.node4.SimplifyCfg-initial.after.mir
+// START rustc.main.SimplifyCfg-initial.after.mir
 //     bb0: {
 //         StorageLive(_1);
 //         _1 = const false;
@@ -82,4 +82,4 @@ fn main() {
 //         StorageDead(_1);
 //         return;
 //     }
-// END rustc.node4.SimplifyCfg-initial.after.mir
+// END rustc.main.SimplifyCfg-initial.after.mir

diff --git a/src/test/mir-opt/box_expr.rs b/src/test/mir-opt/box_expr.rs
index 5c3b418e950016db67d98ebaac93be5b82db5b92..c782859b126f0971ac6e337a5c00c6c00d8eadb9 100644 (file)
--- a/src/test/mir-opt/box_expr.rs
+++ b/src/test/mir-opt/box_expr.rs
@@ -28,7 +28,7 @@ fn drop(&mut self) {
 }
 
 // END RUST SOURCE
-// START rustc.node4.ElaborateDrops.before.mir
+// START rustc.main.ElaborateDrops.before.mir
 //     let mut _0: ();
 //     scope 1 {
 //         let _1: std::boxed::Box<S>;
@@ -88,4 +88,4 @@ fn drop(&mut self) {
 //         return;
 //     }
 // }
-// END rustc.node4.ElaborateDrops.before.mir
+// END rustc.main.ElaborateDrops.before.mir

diff --git a/src/test/mir-opt/copy_propagation.rs b/src/test/mir-opt/copy_propagation.rs
index 69486f4613722685d977991a80ebdd5122b3b5a9..223c65737ad60f4e6f02fd2dcf9fbb7540401c2d 100644 (file)
--- a/src/test/mir-opt/copy_propagation.rs
+++ b/src/test/mir-opt/copy_propagation.rs
@@ -19,7 +19,7 @@ fn main() {
 }
 
 // END RUST SOURCE
-// START rustc.node4.CopyPropagation.before.mir
+// START rustc.test.CopyPropagation.before.mir
 //  bb0: {
 //      ...
 //      _3 = _1;
@@ -31,12 +31,12 @@ fn main() {
 //      ...
 //      return;
 //  }
-// END rustc.node4.CopyPropagation.before.mir
-// START rustc.node4.CopyPropagation.after.mir
+// END rustc.test.CopyPropagation.before.mir
+// START rustc.test.CopyPropagation.after.mir
 //  bb0: {
 //      ...
 //      _0 = _1;
 //      ...
 //      return;
 //  }
-// END rustc.node4.CopyPropagation.after.mir
+// END rustc.test.CopyPropagation.after.mir

diff --git a/src/test/mir-opt/deaggregator_test.rs b/src/test/mir-opt/deaggregator_test.rs
index f4db00dab59dc14f1da97497b7f5ff60540ed5eb..d0f4e3bb60b5ad4e212b1bde7d2ab64fdf42fce4 100644 (file)
--- a/src/test/mir-opt/deaggregator_test.rs
+++ b/src/test/mir-opt/deaggregator_test.rs
@@ -24,7 +24,7 @@ fn main() {
 }
 
 // END RUST SOURCE
-// START rustc.node13.Deaggregator.before.mir
+// START rustc.bar.Deaggregator.before.mir
 // bb0: {
 //     ...
 //     _2 = _1;
@@ -33,8 +33,8 @@ fn main() {
 //     ...
 //     return;
 // }
-// END rustc.node13.Deaggregator.before.mir
-// START rustc.node13.Deaggregator.after.mir
+// END rustc.bar.Deaggregator.before.mir
+// START rustc.bar.Deaggregator.after.mir
 // bb0: {
 //     ...
 //     _2 = _1;
@@ -45,4 +45,4 @@ fn main() {
 //     ...
 //     return;
 // }
-// END rustc.node13.Deaggregator.after.mir
+// END rustc.bar.Deaggregator.after.mir

diff --git a/src/test/mir-opt/deaggregator_test_enum.rs b/src/test/mir-opt/deaggregator_test_enum.rs
index d2c713b320f53134002fad58dc0303a398b4c02a..9400ae5050ba1b719bcc5c6eeb400e595c9d59ab 100644 (file)
--- a/src/test/mir-opt/deaggregator_test_enum.rs
+++ b/src/test/mir-opt/deaggregator_test_enum.rs
@@ -26,7 +26,7 @@ fn main() {
 }
 
 // END RUST SOURCE
-// START rustc.node10.Deaggregator.before.mir
+// START rustc.bar.Deaggregator.before.mir
 // bb0: {
 //     StorageLive(_2);
 //     _2 = _1;
@@ -34,8 +34,8 @@ fn main() {
 //     StorageDead(_2);
 //     return;
 // }
-// END rustc.node10.Deaggregator.before.mir
-// START rustc.node10.Deaggregator.after.mir
+// END rustc.bar.Deaggregator.before.mir
+// START rustc.bar.Deaggregator.after.mir
 // bb0: {
 //     StorageLive(_2);
 //     _2 = _1;
@@ -44,4 +44,4 @@ fn main() {
 //     StorageDead(_2);
 //     return;
 // }
-// END rustc.node10.Deaggregator.after.mir
+// END rustc.bar.Deaggregator.after.mir

diff --git a/src/test/mir-opt/deaggregator_test_enum_2.rs b/src/test/mir-opt/deaggregator_test_enum_2.rs
index 8e7207af0c6871321f8fe1b29dd2c81519acbd63..ab62164e80035ec42b337aad61d154c7410f96dd 100644 (file)
--- a/src/test/mir-opt/deaggregator_test_enum_2.rs
+++ b/src/test/mir-opt/deaggregator_test_enum_2.rs
@@ -29,7 +29,7 @@ fn main() {
 }
 
 // END RUST SOURCE
-// START rustc.node12.Deaggregator.before.mir
+// START rustc.test1.Deaggregator.before.mir
 //  bb1: {
 //      StorageLive(_4);
 //      _4 = _2;
@@ -44,8 +44,8 @@ fn main() {
 //      StorageDead(_5);
 //      goto -> bb3;
 //  }
-// END rustc.node12.Deaggregator.before.mir
-// START rustc.node12.Deaggregator.after.mir
+// END rustc.test1.Deaggregator.before.mir
+// START rustc.test1.Deaggregator.after.mir
 //  bb1: {
 //      StorageLive(_4);
 //      _4 = _2;
@@ -62,5 +62,5 @@ fn main() {
 //      StorageDead(_5);
 //      goto -> bb3;
 //  }
-// END rustc.node12.Deaggregator.after.mir
+// END rustc.test1.Deaggregator.after.mir
 //

diff --git a/src/test/mir-opt/deaggregator_test_multiple.rs b/src/test/mir-opt/deaggregator_test_multiple.rs
index bc06ab67eaa27c4a774e805c8e6c984a40ecb05a..91643e07ed005c1c18a1a85f371afc39bebc4f84 100644 (file)
--- a/src/test/mir-opt/deaggregator_test_multiple.rs
+++ b/src/test/mir-opt/deaggregator_test_multiple.rs
@@ -25,7 +25,7 @@ fn main() {
 }
 
 // END RUST SOURCE
-// START rustc.node10.Deaggregator.before.mir
+// START rustc.test.Deaggregator.before.mir
 // bb0: {
 //     ...
 //     _3 = _1;
@@ -39,8 +39,8 @@ fn main() {
 //     ...
 //     return;
 // }
-// END rustc.node10.Deaggregator.before.mir
-// START rustc.node10.Deaggregator.after.mir
+// END rustc.test.Deaggregator.before.mir
+// START rustc.test.Deaggregator.after.mir
 // bb0: {
 //     ...
 //     _3 = _1;
@@ -56,4 +56,4 @@ fn main() {
 //     ...
 //     return;
 // }
-// END rustc.node10.Deaggregator.after.mir
+// END rustc.test.Deaggregator.after.mir

diff --git a/src/test/mir-opt/end_region_1.rs b/src/test/mir-opt/end_region_1.rs
index a0edcc82fe18ac888bb25df4c1e4c68f4709020a..640dec0861d045e9b689e411e5012e41b9dfd3a7 100644 (file)
--- a/src/test/mir-opt/end_region_1.rs
+++ b/src/test/mir-opt/end_region_1.rs
@@ -19,7 +19,7 @@ fn main() {
 }
 
 // END RUST SOURCE
-// START rustc.node4.SimplifyCfg-qualify-consts.after.mir
+// START rustc.main.SimplifyCfg-qualify-consts.after.mir
 //     let mut _0: ();
 //     ...
 //     let _1: i32;
@@ -37,4 +37,4 @@ fn main() {
 //         StorageDead(_1);
 //         return;
 //     }
-// END rustc.node4.SimplifyCfg-qualify-consts.after.mir
+// END rustc.main.SimplifyCfg-qualify-consts.after.mir

diff --git a/src/test/mir-opt/end_region_2.rs b/src/test/mir-opt/end_region_2.rs
index 69042fecc7d721597d78c947832c9c680a97183e..5ee377569dd168f95dbac24189cd928955e160df 100644 (file)
--- a/src/test/mir-opt/end_region_2.rs
+++ b/src/test/mir-opt/end_region_2.rs
@@ -24,7 +24,7 @@ fn main() {
 }
 
 // END RUST SOURCE
-// START rustc.node4.SimplifyCfg-qualify-consts.after.mir
+// START rustc.main.SimplifyCfg-qualify-consts.after.mir
 //     let mut _0: ();
 //     ...
 //     let _2: bool;
@@ -69,4 +69,4 @@ fn main() {
 //         StorageDead(_2);
 //         goto -> bb1;
 //     }
-// END rustc.node4.SimplifyCfg-qualify-consts.after.mir
+// END rustc.main.SimplifyCfg-qualify-consts.after.mir

diff --git a/src/test/mir-opt/end_region_3.rs b/src/test/mir-opt/end_region_3.rs
index da423163e842da82ab482b93c734b4d32b295730..1dbbd74cdf3c358a6aee8aab8e0ec4870512373d 100644 (file)
--- a/src/test/mir-opt/end_region_3.rs
+++ b/src/test/mir-opt/end_region_3.rs
@@ -25,7 +25,7 @@ fn main() {
 }
 
 // END RUST SOURCE
-// START rustc.node4.SimplifyCfg-qualify-consts.after.mir
+// START rustc.main.SimplifyCfg-qualify-consts.after.mir
 //     let mut _0: ();
 //     ...
 //     let mut _1: bool;
@@ -70,4 +70,4 @@ fn main() {
 //         StorageDead(_3);
 //         goto -> bb1;
 //     }
-// END rustc.node4.SimplifyCfg-qualify-consts.after.mir
+// END rustc.main.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
index 2087485b913d4c272ac8843994be5fa4db5d6e4f..6b8018e4b2211848c3df51da2d68120ae2a1a687 100644 (file)
--- a/src/test/mir-opt/end_region_4.rs
+++ b/src/test/mir-opt/end_region_4.rs
@@ -29,7 +29,7 @@ fn foo(i: i32) {
 }
 
 // END RUST SOURCE
-// START rustc.node4.SimplifyCfg-qualify-consts.after.mir
+// START rustc.main.SimplifyCfg-qualify-consts.after.mir
 //     let mut _0: ();
 //     ...
 //     let _1: D;
@@ -76,4 +76,4 @@ fn foo(i: i32) {
 //         StorageDead(_1);
 //         return;
 //     }
-// END rustc.node4.SimplifyCfg-qualify-consts.after.mir
+// END rustc.main.SimplifyCfg-qualify-consts.after.mir

diff --git a/src/test/mir-opt/end_region_5.rs b/src/test/mir-opt/end_region_5.rs
index 4663b71bd7cb0166720c737fdd94f6bfe5c9e704..2098f4453cf2a7bd7350c8b90205319c3be18ec4 100644 (file)
--- a/src/test/mir-opt/end_region_5.rs
+++ b/src/test/mir-opt/end_region_5.rs
@@ -26,7 +26,7 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
 }
 
 // END RUST SOURCE
-// START rustc.node4.SimplifyCfg-qualify-consts.after.mir
+// START rustc.main.SimplifyCfg-qualify-consts.after.mir
 // fn main() -> () {
 //     ...
 //     let mut _0: ();
@@ -64,9 +64,9 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
 //         return;
 //     }
 // }
-// END rustc.node4.SimplifyCfg-qualify-consts.after.mir
+// END rustc.main.SimplifyCfg-qualify-consts.after.mir
 
-// START rustc.node18.SimplifyCfg-qualify-consts.after.mir
+// START rustc.main.{{closure}}.SimplifyCfg-qualify-consts.after.mir
 // fn main::{{closure}}(_1: [closure@NodeId(18) d:&'14s D]) -> i32 {
 //    let mut _0: i32;
 //    let mut _2: i32;
@@ -78,4 +78,4 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
 //        StorageDead(_2);
 //        return;
 //    }
-// END rustc.node18.SimplifyCfg-qualify-consts.after.mir
+// END rustc.main.{{closure}}.SimplifyCfg-qualify-consts.after.mir

diff --git a/src/test/mir-opt/end_region_6.rs b/src/test/mir-opt/end_region_6.rs
index 7d2868ee4ba57f0813854fb5566fe488d2b094a5..fdfbbdc28fc66b36c62892300bd23f4b3edacdbd 100644 (file)
--- a/src/test/mir-opt/end_region_6.rs
+++ b/src/test/mir-opt/end_region_6.rs
@@ -26,7 +26,7 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
 }
 
 // END RUST SOURCE
-// START rustc.node4.SimplifyCfg-qualify-consts.after.mir
+// START rustc.main.SimplifyCfg-qualify-consts.after.mir
 // fn main() -> () {
 //     let mut _0: ();
 //     ...
@@ -62,9 +62,9 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
 //         StorageDead(_1);
 //         return;
 //     }
-// END rustc.node4.SimplifyCfg-qualify-consts.after.mir
+// END rustc.main.SimplifyCfg-qualify-consts.after.mir
 
-// START rustc.node22.SimplifyCfg-qualify-consts.after.mir
+// START rustc.main.{{closure}}.SimplifyCfg-qualify-consts.after.mir
 // fn main::{{closure}}(_1: [closure@NodeId(22) d:&'19s D]) -> i32 {
 //     let mut _0: i32;
 //     ...
@@ -82,4 +82,4 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
 //         StorageDead(_2);
 //         return;
 //     }
-// END rustc.node22.SimplifyCfg-qualify-consts.after.mir
+// END rustc.main.{{closure}}.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
index 0156c1be7edf95b3f282ec83789494ac26d3304f..9260d0d9d0db07aa2cd4429e8df77d99846e5ae5 100644 (file)
--- a/src/test/mir-opt/end_region_7.rs
+++ b/src/test/mir-opt/end_region_7.rs
@@ -26,7 +26,7 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
 }
 
 // END RUST SOURCE
-// START rustc.node4.SimplifyCfg-qualify-consts.after.mir
+// START rustc.main.SimplifyCfg-qualify-consts.after.mir
 // fn main() -> () {
 //     let mut _0: ();
 //     ...
@@ -70,9 +70,9 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
 //         return;
 //     }
 // }
-// END rustc.node4.SimplifyCfg-qualify-consts.after.mir
+// END rustc.main.SimplifyCfg-qualify-consts.after.mir
 
-// START rustc.node22.SimplifyCfg-qualify-consts.after.mir
+// START rustc.main.{{closure}}.SimplifyCfg-qualify-consts.after.mir
 // fn main::{{closure}}(_1: [closure@NodeId(22) d:D]) -> i32 {
 //     let mut _0: i32;
 //     ...
@@ -94,4 +94,4 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
 //         return;
 //     }
 // }
-// END rustc.node22.SimplifyCfg-qualify-consts.after.mir
+// END rustc.main.{{closure}}.SimplifyCfg-qualify-consts.after.mir

diff --git a/src/test/mir-opt/end_region_8.rs b/src/test/mir-opt/end_region_8.rs
index 6e8cf4204ee9becdc2a5b75033f2c3c019168e4d..cb3713915bd49d0c809838a08edb37d3e31c979e 100644 (file)
--- a/src/test/mir-opt/end_region_8.rs
+++ b/src/test/mir-opt/end_region_8.rs
@@ -27,7 +27,7 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
 }
 
 // END RUST SOURCE
-// START rustc.node4.SimplifyCfg-qualify-consts.after.mir
+// START rustc.main.SimplifyCfg-qualify-consts.after.mir
 // fn main() -> () {
 //    let mut _0: ();
 //    ...
@@ -69,9 +69,9 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
 //        return;
 //    }
 // }
-// END rustc.node4.SimplifyCfg-qualify-consts.after.mir
+// END rustc.main.SimplifyCfg-qualify-consts.after.mir
 
-// START rustc.node22.SimplifyCfg-qualify-consts.after.mir
+// START rustc.main.{{closure}}.SimplifyCfg-qualify-consts.after.mir
 // fn main::{{closure}}(_1: [closure@NodeId(22) r:&'21_1rs D]) -> i32 {
 //     let mut _0: i32;
 //     let mut _2: i32;
@@ -84,4 +84,4 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
 //         return;
 //     }
 // }
-// END rustc.node22.SimplifyCfg-qualify-consts.after.mir
+// END rustc.main.{{closure}}.SimplifyCfg-qualify-consts.after.mir

diff --git a/src/test/mir-opt/end_region_9.rs b/src/test/mir-opt/end_region_9.rs
index fd23d81345229644dda85be4bbcd9207e4d7a7ad..d3482077305423e3d384c5813f784fed9a70fb12 100644 (file)
--- a/src/test/mir-opt/end_region_9.rs
+++ b/src/test/mir-opt/end_region_9.rs
@@ -37,7 +37,7 @@ fn main() {
 }
 
 // END RUST SOURCE
-// START rustc.node4.SimplifyCfg-qualify-consts.after.mir
+// START rustc.main.SimplifyCfg-qualify-consts.after.mir
 // fn main() -> () {
 //     let mut _0: ();
 //     ...
@@ -84,4 +84,4 @@ fn main() {
 //        goto -> bb1;
 //    }
 // }
-// END rustc.node4.SimplifyCfg-qualify-consts.after.mir
+// END rustc.main.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
index f70f651927544488aca0069eb13b8340768fb757..5eada97ed20ab05eee5a87a5dadd729d0675b9a5 100644 (file)
--- a/src/test/mir-opt/end_region_cyclic.rs
+++ b/src/test/mir-opt/end_region_cyclic.rs
@@ -39,7 +39,7 @@ fn main() {
 fn query() -> bool { true }
 
 // END RUST SOURCE
-// START rustc.node16.SimplifyCfg-qualify-consts.after.mir
+// START rustc.main.SimplifyCfg-qualify-consts.after.mir
 // fn main() -> () {
 //     let mut _0: ();
 //     scope 1 {
@@ -130,4 +130,4 @@ fn query() -> bool { true }
 //         goto -> bb1;
 //     }
 // }
-// END rustc.node16.SimplifyCfg-qualify-consts.after.mir
+// END rustc.main.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
index 61dc1d206596178964190166a64b53fb4445401a..12d14df47df7d92dd366c32b5ec41b6990182325 100644 (file)
--- a/src/test/mir-opt/end_region_destruction_extents_1.rs
+++ b/src/test/mir-opt/end_region_destruction_extents_1.rs
@@ -60,11 +60,11 @@ fn drop(&mut self) {
 //        transformation encoding the effects of rvalue-promotion.
 //        This may be the simplest and most-likely option; note in
 //        particular that `StorageDead(_6)` goes away below in
-//        rustc.node4.QualifyAndPromoteConstants.after.mir
+//        rustc.main.QualifyAndPromoteConstants.after.mir
 
 // END RUST SOURCE
 
-// START rustc.node4.QualifyAndPromoteConstants.before.mir
+// START rustc.main.QualifyAndPromoteConstants.before.mir
 // fn main() -> () {
 //     let mut _0: ();
 //     let mut _1: &'12ds S1;
@@ -113,9 +113,9 @@ fn drop(&mut self) {
 //         return;
 //     }
 // }
-// END rustc.node4.QualifyAndPromoteConstants.before.mir
+// END rustc.main.QualifyAndPromoteConstants.before.mir
 
-// START rustc.node4.QualifyAndPromoteConstants.after.mir
+// START rustc.main.QualifyAndPromoteConstants.after.mir
 // fn main() -> () {
 //     let mut _0: ();
 //     let mut _1: &'12ds S1;
@@ -158,4 +158,4 @@ fn drop(&mut self) {
 //         return;
 //     }
 // }
-// END rustc.node4.QualifyAndPromoteConstants.after.mir
+// END rustc.main.QualifyAndPromoteConstants.after.mir

diff --git a/src/test/mir-opt/issue-38669.rs b/src/test/mir-opt/issue-38669.rs
index 5a9336e96592d6a287eb159eb6d667375622497d..9415e140d8048e0f44822f31c91a95056ba25e6e 100644 (file)
--- a/src/test/mir-opt/issue-38669.rs
+++ b/src/test/mir-opt/issue-38669.rs
@@ -21,7 +21,7 @@ fn main() {
 }
 
 // END RUST SOURCE
-// START rustc.node4.SimplifyCfg-initial.after.mir
+// START rustc.main.SimplifyCfg-initial.after.mir
 //     bb0: {
 //         StorageLive(_1);
 //         _1 = const false;
@@ -48,4 +48,4 @@ fn main() {
 //         _2 = ();
 //         goto -> bb1;
 //     }
-// END rustc.node4.SimplifyCfg-initial.after.mir
+// END rustc.main.SimplifyCfg-initial.after.mir

diff --git a/src/test/mir-opt/issue-41110.rs b/src/test/mir-opt/issue-41110.rs
index bfac6c739a3c226cbfddd96f647688a11700e540..b409d1fb667905c568566a8ba923220453ba4c86 100644 (file)
--- a/src/test/mir-opt/issue-41110.rs
+++ b/src/test/mir-opt/issue-41110.rs
@@ -35,7 +35,7 @@ fn other(self, s: Self) {}
 }
 
 // END RUST SOURCE
-// START rustc.node4.ElaborateDrops.after.mir
+// START rustc.main.ElaborateDrops.after.mir
 //    let mut _0: ();
 //    scope 1 {
 //        let _1: ();
@@ -46,8 +46,8 @@ fn other(self, s: Self) {}
 //    let mut _4: S;
 //    let mut _5: bool;
 //    bb0: {
-// END rustc.node4.ElaborateDrops.after.mir
-// START rustc.node13.ElaborateDrops.after.mir
+// END rustc.main.ElaborateDrops.after.mir
+// START rustc.test.ElaborateDrops.after.mir
 //    let mut _0: ();
 //    ...
 //    let _1: S;
@@ -59,4 +59,4 @@ fn other(self, s: Self) {}
 //    let mut _5: S;
 //    let mut _6: bool;
 //    bb0: {
-// END rustc.node13.ElaborateDrops.after.mir
+// END rustc.test.ElaborateDrops.after.mir

diff --git a/src/test/mir-opt/issue-43457.rs b/src/test/mir-opt/issue-43457.rs
index 3f0f5068577c6427a196094168577f15f6925a9c..85cecc5070cd55c97c30eb0623cac7527730aef1 100644 (file)
--- a/src/test/mir-opt/issue-43457.rs
+++ b/src/test/mir-opt/issue-43457.rs
@@ -23,7 +23,7 @@ fn rc_refcell_test(r: RefCell<i32>) {
 fn main() { }
 
 // END RUST SOURCE
-// START rustc.node5.SimplifyCfg-qualify-consts.after.mir
+// START rustc.rc_refcell_test.SimplifyCfg-qualify-consts.after.mir
 //
 // fn rc_refcell_test(_1: std::cell::RefCell<i32>) -> () {
 //     let mut _0: ();

diff --git a/src/test/mir-opt/match_false_edges.rs b/src/test/mir-opt/match_false_edges.rs
index 56c5dd3be472d4c6ab8e1f991b28d0b7362328cf..02e9d39668de00106742bfe46e2d9d25cfbaaa3f 100644 (file)
--- a/src/test/mir-opt/match_false_edges.rs
+++ b/src/test/mir-opt/match_false_edges.rs
@@ -49,7 +49,7 @@ fn main() {
 
 // END RUST SOURCE
 //
-// START rustc.node17.SimplifyBranches-initial.before.mir
+// START rustc.full_tested_match.SimplifyBranches-initial.before.mir
 //  bb0: {
 //      ...
 //      _2 = std::option::Option<i32>::Some(const 42i32,);
@@ -104,9 +104,9 @@ fn main() {
 //      ...
 //      return;
 //  }
-// END rustc.node17.SimplifyBranches-initial.before.mir
+// END rustc.full_tested_match.SimplifyBranches-initial.before.mir
 //
-// START rustc.node42.SimplifyBranches-initial.before.mir
+// START rustc.full_tested_match2.SimplifyBranches-initial.before.mir
 //  bb0: {
 //      ...
 //      _2 = std::option::Option<i32>::Some(const 42i32,);
@@ -161,9 +161,9 @@ fn main() {
 //      ...
 //      return;
 //  }
-// END rustc.node42.SimplifyBranches-initial.before.mir
+// END rustc.full_tested_match2.SimplifyBranches-initial.before.mir
 //
-// START rustc.node67.SimplifyBranches-initial.before.mir
+// START rustc.main.SimplifyBranches-initial.before.mir
 // bb0: {
 //     ...
 //     _2 = std::option::Option<i32>::Some(const 1i32,);
@@ -237,4 +237,4 @@ fn main() {
 //     ...
 //     return;
 // }
-// END rustc.node67.SimplifyBranches-initial.before.mir
+// END rustc.main.SimplifyBranches-initial.before.mir

diff --git a/src/test/mir-opt/nll/liveness-call-subtlety.rs b/src/test/mir-opt/nll/liveness-call-subtlety.rs
index 873431505f544fb34a57cbf96a6b27b774358ea6..2de3e7d704d567f77f867b9fe1a6358aa3e9a490 100644 (file)
--- a/src/test/mir-opt/nll/liveness-call-subtlety.rs
+++ b/src/test/mir-opt/nll/liveness-call-subtlety.rs
@@ -25,7 +25,7 @@ fn main() {
 // - `_1` is live when `can_panic` is called (because it may be dropped)
 //
 // END RUST SOURCE
-// START rustc.node12.nll.0.mir
+// START rustc.main.nll.0.mir
 //    | Live variables on entry to bb0: []
 //    bb0: {
 //            | Live variables at bb0[0]: []
@@ -37,8 +37,8 @@ fn main() {
 //            | Live variables at bb0[3]: [_2]
 //        _1 = const <std::boxed::Box<T>>::new(_2) -> bb1;
 //    }
-// END rustc.node12.nll.0.mir
-// START rustc.node12.nll.0.mir
+// END rustc.main.nll.0.mir
+// START rustc.main.nll.0.mir
 //    | Live variables on entry to bb1: [_1 (drop)]
 //    bb1: {
 //            | Live variables at bb1[0]: [_1 (drop)]
@@ -48,4 +48,4 @@ fn main() {
 //            | Live variables at bb1[2]: [_1 (drop)]
 //        _3 = const can_panic() -> [return: bb2, unwind: bb4];
 //    }
-// END rustc.node12.nll.0.mir
+// END rustc.main.nll.0.mir

diff --git a/src/test/mir-opt/nll/liveness-drop-intra-block.rs b/src/test/mir-opt/nll/liveness-drop-intra-block.rs
index 96fd29dfe2fd9eb0ac3be46b68b9c391dc71a510..5c34479d25958ae75943b4c27f02b9bc5d525e1d 100644 (file)
--- a/src/test/mir-opt/nll/liveness-drop-intra-block.rs
+++ b/src/test/mir-opt/nll/liveness-drop-intra-block.rs
@@ -24,7 +24,7 @@ fn main() {
 }
 
 // END RUST SOURCE
-// START rustc.node12.nll.0.mir
+// START rustc.main.nll.0.mir
 //    | Live variables on entry to bb1: []
 //    bb1: {
 //            | Live variables at bb1[0]: []
@@ -38,4 +38,4 @@ fn main() {
 //            | Live variables at bb1[4]: [_4]
 //        _3 = const use_x(_4) -> bb2;
 //    }
-// END rustc.node12.nll.0.mir
+// END rustc.main.nll.0.mir

diff --git a/src/test/mir-opt/nll/liveness-interblock.rs b/src/test/mir-opt/nll/liveness-interblock.rs
index c557763c004bff84db7f7ea38752d93e36714e39..8217befca6bd5eaea2086fe972bff7ba9c4bd42d 100644 (file)
--- a/src/test/mir-opt/nll/liveness-interblock.rs
+++ b/src/test/mir-opt/nll/liveness-interblock.rs
@@ -28,7 +28,7 @@ fn main() {
 }
 
 // END RUST SOURCE
-// START rustc.node18.nll.0.mir
+// START rustc.main.nll.0.mir
 //     | Live variables on entry to bb2: [_1]
 //     bb2: {
 //             | Live variables at bb2[0]: [_1]
@@ -38,13 +38,13 @@ fn main() {
 //             | Live variables at bb2[2]: [_4]
 //         _3 = const make_live(_4) -> bb4;
 //     }
-// END rustc.node18.nll.0.mir
-// START rustc.node18.nll.0.mir
+// END rustc.main.nll.0.mir
+// START rustc.main.nll.0.mir
 //     | Live variables on entry to bb3: []
 //     bb3: {
 //             | Live variables at bb3[0]: []
 //         _5 = const make_dead() -> bb5;
 //     }
-// END rustc.node18.nll.0.mir
+// END rustc.main.nll.0.mir
 
 

diff --git a/src/test/mir-opt/nll/reborrow-basic.rs b/src/test/mir-opt/nll/reborrow-basic.rs
index 60a4da430b96e5fce16d96359ea8ea40ce8c4077..c3df0c840ded29cefd17033fe31d49f0b47e57f4 100644 (file)
--- a/src/test/mir-opt/nll/reborrow-basic.rs
+++ b/src/test/mir-opt/nll/reborrow-basic.rs
@@ -27,13 +27,13 @@ fn main() {
 }
 
 // END RUST SOURCE
-// START rustc.node13.nll.0.mir
+// START rustc.main.nll.0.mir
 // | '_#5r: {bb0[6], bb0[7], bb0[8], bb0[9], bb0[10], bb0[11], bb0[12], bb0[13], bb0[14]}
 // ...
 // | '_#7r: {bb0[11], bb0[12], bb0[13], bb0[14]}
-// END rustc.node13.nll.0.mir
-// START rustc.node13.nll.0.mir
+// END rustc.main.nll.0.mir
+// START rustc.main.nll.0.mir
 // let _2: &'_#5r mut i32;
 // ...
 // let _4: &'_#7r mut i32;
-// END rustc.node13.nll.0.mir
+// END rustc.main.nll.0.mir

diff --git a/src/test/mir-opt/nll/region-liveness-basic.rs b/src/test/mir-opt/nll/region-liveness-basic.rs
index 7792f0a36f318df3c1b29091a9b2c4201c2edcfa..f7276cb297904c016ac128aeefcb1f9ee4af1b5d 100644 (file)
--- a/src/test/mir-opt/nll/region-liveness-basic.rs
+++ b/src/test/mir-opt/nll/region-liveness-basic.rs
@@ -30,21 +30,21 @@ fn main() {
 }
 
 // END RUST SOURCE
-// START rustc.node12.nll.0.mir
+// START rustc.main.nll.0.mir
 // | '_#0r: {bb1[1], bb2[0], bb2[1]}
 // | '_#1r: {bb1[1], bb2[0], bb2[1]}
 // ...
 //             let _2: &'_#1r usize;
-// END rustc.node12.nll.0.mir
-// START rustc.node12.nll.0.mir
+// END rustc.main.nll.0.mir
+// START rustc.main.nll.0.mir
 //    bb1: {
 //            | Live variables at bb1[0]: [_1, _3]
 //        _2 = &'_#0r _1[_3];
 //            | Live variables at bb1[1]: [_2]
 //        switchInt(const true) -> [0u8: bb3, otherwise: bb2];
 //    }
-// END rustc.node12.nll.0.mir
-// START rustc.node12.nll.0.mir
+// END rustc.main.nll.0.mir
+// START rustc.main.nll.0.mir
 //    bb2: {
 //            | Live variables at bb2[0]: [_2]
 //        StorageLive(_7);
@@ -53,4 +53,4 @@ fn main() {
 //            | Live variables at bb2[2]: [_7]
 //        _6 = const use_x(_7) -> bb4;
 //    }
-// END rustc.node12.nll.0.mir
+// END rustc.main.nll.0.mir

diff --git a/src/test/mir-opt/nll/region-liveness-drop-may-dangle.rs b/src/test/mir-opt/nll/region-liveness-drop-may-dangle.rs
index 4f4bb596e5f8fa3ded771b7598a5ff5ed82a0989..6527df26eae7842b218a97f85d670a22118bc109 100644 (file)
--- a/src/test/mir-opt/nll/region-liveness-drop-may-dangle.rs
+++ b/src/test/mir-opt/nll/region-liveness-drop-may-dangle.rs
@@ -43,6 +43,6 @@ fn drop(&mut self) { }
 }
 
 // END RUST SOURCE
-// START rustc.node12.nll.0.mir
+// START rustc.main.nll.0.mir
 // | '_#4r: {bb1[3], bb1[4], bb1[5], bb2[0], bb2[1]}
-// END rustc.node12.nll.0.mir
+// END rustc.main.nll.0.mir

diff --git a/src/test/mir-opt/nll/region-liveness-drop-no-may-dangle.rs b/src/test/mir-opt/nll/region-liveness-drop-no-may-dangle.rs
index 0ddb745b61fd7c9212c41bf0be7e606c2be0812d..aedb3f562a66d0192fdb5d13c0945f039491f6f1 100644 (file)
--- a/src/test/mir-opt/nll/region-liveness-drop-no-may-dangle.rs
+++ b/src/test/mir-opt/nll/region-liveness-drop-no-may-dangle.rs
@@ -45,6 +45,6 @@ fn drop(&mut self) { }
 }
 
 // END RUST SOURCE
-// START rustc.node12.nll.0.mir
+// START rustc.main.nll.0.mir
 // | '_#4r: {bb1[3], bb1[4], bb1[5], bb2[0], bb2[1], bb2[2], bb3[0], bb3[1], bb3[2], bb4[0], bb4[1], bb4[2], bb6[0], bb7[0], bb7[1], bb7[2], bb8[0]}
-// END rustc.node12.nll.0.mir
+// 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
index 664298b937483a7777d9c40f6bd3d6543a45dda5..23809d176f698a5e55b327a3fe391dc9c9634922 100644 (file)
--- a/src/test/mir-opt/nll/region-liveness-two-disjoint-uses.rs
+++ b/src/test/mir-opt/nll/region-liveness-two-disjoint-uses.rs
@@ -35,7 +35,7 @@ fn main() {
 }
 
 // END RUST SOURCE
-// START rustc.node12.nll.0.mir
+// START rustc.main.nll.0.mir
 // | '_#0r: {bb1[1], bb2[0], bb2[1]}
 // ...
 // | '_#2r: {bb7[2], bb7[3], bb7[4]}
@@ -46,4 +46,4 @@ fn main() {
 // _2 = &'_#0r _1[_3];
 // ...
 // _2 = &'_#2r (*_11);
-// END rustc.node12.nll.0.mir
+// END rustc.main.nll.0.mir

diff --git a/src/test/mir-opt/nll/region-subtyping-basic.rs b/src/test/mir-opt/nll/region-subtyping-basic.rs
index 4ae891f5b70eb91004e4d3ce78249a1c74219535..cada9c7b2548d822e386c44f1b1fd4fe2cf4e67b 100644 (file)
--- a/src/test/mir-opt/nll/region-subtyping-basic.rs
+++ b/src/test/mir-opt/nll/region-subtyping-basic.rs
@@ -31,12 +31,12 @@ fn main() {
 }
 
 // END RUST SOURCE
-// START rustc.node12.nll.0.mir
+// START rustc.main.nll.0.mir
 // | '_#0r: {bb1[1], bb1[2], bb1[3], bb1[4], bb1[5], bb1[6], bb2[0], bb2[1]}
 // | '_#1r: {bb1[1], bb1[2], bb1[3], bb1[4], bb1[5], bb1[6], bb2[0], bb2[1]}
 // | '_#2r: {bb1[5], bb1[6], bb2[0], bb2[1]}
-// END rustc.node12.nll.0.mir
-// START rustc.node12.nll.0.mir
+// END rustc.main.nll.0.mir
+// START rustc.main.nll.0.mir
 // let _2: &'_#1r usize;
 // ...
 // let _6: &'_#2r usize;
@@ -46,4 +46,4 @@ fn main() {
 // _7 = _2;
 // ...
 // _6 = _7;
-// END rustc.node12.nll.0.mir
+// END rustc.main.nll.0.mir

diff --git a/src/test/mir-opt/simplify_if.rs b/src/test/mir-opt/simplify_if.rs
index cff108246a550da31dd2e116b4460b8409e1f2fc..ad3bbba8d08df2a82230854e4eb47f5d6e5106ab 100644 (file)
--- a/src/test/mir-opt/simplify_if.rs
+++ b/src/test/mir-opt/simplify_if.rs
@@ -15,13 +15,13 @@ fn main() {
 }
 
 // END RUST SOURCE
-// START rustc.node4.SimplifyBranches-initial.before.mir
+// START rustc.main.SimplifyBranches-initial.before.mir
 // bb0: {
 //     switchInt(const false) -> [0u8: bb2, otherwise: bb1];
 // }
-// END rustc.node4.SimplifyBranches-initial.before.mir
-// START rustc.node4.SimplifyBranches-initial.after.mir
+// END rustc.main.SimplifyBranches-initial.before.mir
+// START rustc.main.SimplifyBranches-initial.after.mir
 // bb0: {
 //     goto -> bb2;
 // }
-// END rustc.node4.SimplifyBranches-initial.after.mir
+// END rustc.main.SimplifyBranches-initial.after.mir

diff --git a/src/test/mir-opt/storage_live_dead_in_statics.rs b/src/test/mir-opt/storage_live_dead_in_statics.rs
index 370ab599eca708790b0b802fe2a82783eea72ba1..995639e20d67d5a580c8d73b7261b7ca67b7d554 100644 (file)
--- a/src/test/mir-opt/storage_live_dead_in_statics.rs
+++ b/src/test/mir-opt/storage_live_dead_in_statics.rs
@@ -44,7 +44,7 @@ fn main() {
 }
 
 // END RUST SOURCE
-// START rustc.node4.mir_map.0.mir
+// START rustc.XXX.mir_map.0.mir
 //    let mut _0: &'static Foo;
 //    let mut _1: &'static Foo;
 //    let mut _2: Foo;
@@ -197,4 +197,4 @@ fn main() {
 //        return;
 //    }
 //}
-// END rustc.node4.mir_map.0.mir
+// END rustc.XXX.mir_map.0.mir

diff --git a/src/test/mir-opt/storage_ranges.rs b/src/test/mir-opt/storage_ranges.rs
index 7dbcf82af349382222e7d533e64888c012760e06..53cb82bb0f67481f475139bc1a9084dd7621d246 100644 (file)
--- a/src/test/mir-opt/storage_ranges.rs
+++ b/src/test/mir-opt/storage_ranges.rs
@@ -19,7 +19,7 @@ fn main() {
 }
 
 // END RUST SOURCE
-// START rustc.node4.TypeckMir.before.mir
+// START rustc.main.TypeckMir.before.mir
 //     bb0: {
 //         StorageLive(_1);
 //         _1 = const 0i32;
@@ -40,4 +40,4 @@ fn main() {
 //         StorageDead(_1);
 //         return;
 //      }
-// END rustc.node4.TypeckMir.before.mir
+// END rustc.main.TypeckMir.before.mir

diff --git a/src/test/mir-opt/validate_1.rs b/src/test/mir-opt/validate_1.rs
index a97ce4e8cbe5549326e128000b5e2e292c725047..3d71c5daba31614dc54c3f16c57a14b8ae122fff 100644 (file)
--- a/src/test/mir-opt/validate_1.rs
+++ b/src/test/mir-opt/validate_1.rs
@@ -28,14 +28,14 @@ fn main() {
 }
 
 // END RUST SOURCE
-// START rustc.node12.EraseRegions.after.mir
+// START rustc.{{impl}}.foo.EraseRegions.after.mir
 //     bb0: {
 //         Validate(Acquire, [_1: &ReFree(DefId { krate: CrateNum(0), index: DefIndex(0:5) => validate_1[317d]::{{impl}}[0]::foo[0] }, BrAnon(0)) Test, _2: &ReFree(DefId { krate: CrateNum(0), index: DefIndex(0:5) => validate_1[317d]::{{impl}}[0]::foo[0] }, BrAnon(1)) mut i32]);
 //         ...
 //         return;
 //     }
-// END rustc.node12.EraseRegions.after.mir
-// START rustc.node23.EraseRegions.after.mir
+// END rustc.{{impl}}.foo.EraseRegions.after.mir
+// START rustc.main.EraseRegions.after.mir
 // fn main() -> () {
 //     ...
 //     bb0: {
@@ -57,8 +57,8 @@ fn main() {
 //         return;
 //     }
 // }
-// END rustc.node23.EraseRegions.after.mir
-// START rustc.node50.EraseRegions.after.mir
+// END rustc.main.EraseRegions.after.mir
+// START rustc.main.{{closure}}.EraseRegions.after.mir
 // fn main::{{closure}}(_1: &ReErased [closure@NodeId(50)], _2: &ReErased mut i32) -> i32 {
 //     ...
 //     bb0: {
@@ -76,4 +76,4 @@ fn main() {
 //         return;
 //     }
 // }
-// END rustc.node50.EraseRegions.after.mir
+// END rustc.main.{{closure}}.EraseRegions.after.mir

diff --git a/src/test/mir-opt/validate_2.rs b/src/test/mir-opt/validate_2.rs
index aacf5a5ed0f5afd0ee71579e2d47332f523d211e..5f3dad5efde15d402d71cf863fc6d8abd230ae8f 100644 (file)
--- a/src/test/mir-opt/validate_2.rs
+++ b/src/test/mir-opt/validate_2.rs
@@ -16,7 +16,7 @@ fn main() {
 }
 
 // END RUST SOURCE
-// START rustc.node4.EraseRegions.after.mir
+// START rustc.main.EraseRegions.after.mir
 // fn main() -> () {
 //     ...
 //     bb1: {
@@ -32,4 +32,4 @@ fn main() {
 //     }
 //     ...
 // }
-// END rustc.node4.EraseRegions.after.mir
+// END rustc.main.EraseRegions.after.mir

diff --git a/src/test/mir-opt/validate_3.rs b/src/test/mir-opt/validate_3.rs
index d7d3e023c9ed6a51496c62d9d395d5e2cfc3ef29..50c410039e2c51a6c2e5d52bbd9c84c16ab0ae6b 100644 (file)
--- a/src/test/mir-opt/validate_3.rs
+++ b/src/test/mir-opt/validate_3.rs
@@ -28,7 +28,7 @@ fn _unused2(x: *const i32) -> i32 { unsafe { *x }}
 }
 
 // END RUST SOURCE
-// START rustc.node16.EraseRegions.after.mir
+// START rustc.main.EraseRegions.after.mir
 // fn main() -> () {
 //     ...
 //     let mut _5: &ReErased i32;
@@ -62,4 +62,4 @@ fn _unused2(x: *const i32) -> i32 { unsafe { *x }}
 //         return;
 //     }
 // }
-// END rustc.node16.EraseRegions.after.mir
+// END rustc.main.EraseRegions.after.mir

diff --git a/src/test/mir-opt/validate_4.rs b/src/test/mir-opt/validate_4.rs
index 3585ac0b8be76529025ed7ab98a849a94b731cf4..2ea4867b4018274dc9bc0ca33d4b42dbd6f39644 100644 (file)
--- a/src/test/mir-opt/validate_4.rs
+++ b/src/test/mir-opt/validate_4.rs
@@ -36,7 +36,7 @@ fn main() {
 // contain name of the source file, so we cannot test for it.
 
 // END RUST SOURCE
-// START rustc.node4.EraseRegions.after.mir
+// START rustc.write_42.EraseRegions.after.mir
 // fn write_42(_1: *mut i32) -> bool {
 //     ...
 //     bb0: {
@@ -46,8 +46,8 @@ fn main() {
 //         return;
 //     }
 // }
-// END rustc.node4.EraseRegions.after.mir
-// START rustc.node22.EraseRegions.after.mir
+// END rustc.write_42.EraseRegions.after.mir
+// START rustc.write_42.{{closure}}.EraseRegions.after.mir
 // fn write_42::{{closure}}(_1: &ReErased [closure@NodeId(22)], _2: *mut i32) -> () {
 //     ...
 //     bb0: {
@@ -57,8 +57,8 @@ fn main() {
 //         return;
 //     }
 // }
-// END rustc.node22.EraseRegions.after.mir
-// START rustc.node31.EraseRegions.after.mir
+// END rustc.write_42.{{closure}}.EraseRegions.after.mir
+// START rustc.test.EraseRegions.after.mir
 // fn test(_1: &ReErased mut i32) -> () {
 //     ...
 //     bb0: {
@@ -73,8 +73,8 @@ fn main() {
 //         ...
 //     }
 // }
-// END rustc.node31.EraseRegions.after.mir
-// START rustc.node60.EraseRegions.after.mir
+// END rustc.test.EraseRegions.after.mir
+// START rustc.main.{{closure}}.EraseRegions.after.mir
 // fn main::{{closure}}(_1: &ReErased [closure@NodeId(60)], _2: &ReErased mut i32) -> bool {
 //     ...
 //     bb0: {
@@ -86,4 +86,4 @@ fn main() {
 //     }
 //     ...
 // }
-// END rustc.node60.EraseRegions.after.mir
+// END rustc.main.{{closure}}.EraseRegions.after.mir

diff --git a/src/test/mir-opt/validate_5.rs b/src/test/mir-opt/validate_5.rs
index ae09d72942e55808e3ce1b9c60f9868014f6be49..24b4d2099b324a1663f9aee9340e5d9a73f47922 100644 (file)
--- a/src/test/mir-opt/validate_5.rs
+++ b/src/test/mir-opt/validate_5.rs
@@ -33,7 +33,7 @@ fn main() {
 }
 
 // END RUST SOURCE
-// START rustc.node17.EraseRegions.after.mir
+// START rustc.test.EraseRegions.after.mir
 // fn test(_1: &ReErased mut i32) -> () {
 //     ...
 //     bb0: {
@@ -44,8 +44,8 @@ fn main() {
 //     }
 //     ...
 // }
-// END rustc.node17.EraseRegions.after.mir
-// START rustc.node46.EraseRegions.after.mir
+// END rustc.test.EraseRegions.after.mir
+// START rustc.main.{{closure}}.EraseRegions.after.mir
 // fn main::{{closure}}(_1: &ReErased [closure@NodeId(46)], _2: &ReErased mut i32) -> bool {
 //     ...
 //     bb0: {
@@ -63,4 +63,4 @@ fn main() {
 //     }
 //     ...
 // }
-// END rustc.node46.EraseRegions.after.mir
+// END rustc.main.{{closure}}.EraseRegions.after.mir