Auto merge of #45757 - mikhail-m1:change-mir-dump-filename, r=nikomatsakis

change MIR dump filenames from `rustc.nodeN...` to `rustc.<DefPath>`

r? @nikomatsakis

42 files changed, 161 insertions, 134 deletions

diff --git a/src/librustc/hir/map/definitions.rs b/src/librustc/hir/map/definitions.rs
index b30cc0b09c9..dfa675f2e93 100644
--- a/src/librustc/hir/map/definitions.rs
+++ b/src/librustc/hir/map/definitions.rs
@@ -314,6 +314,29 @@ impl DefPath {
 
         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);
+
+        let mut opt_delimiter = None;
+        for component in &self.data {
+            opt_delimiter.map(|d| s.push(d));
+            opt_delimiter = Some('-');
+            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 1d924175b21..0f07f1fe550 100644
--- a/src/librustc_mir/util/pretty.rs
+++ b/src/librustc_mir/util/pretty.rs
@@ -132,9 +132,13 @@ where
         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 d3bf7f68785..e7263b47394 100644
--- 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 5c3b418e950..c782859b126 100644
--- a/src/test/mir-opt/box_expr.rs
+++ b/src/test/mir-opt/box_expr.rs
@@ -28,7 +28,7 @@ impl Drop for S {
 }
 
 // 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 @@ impl Drop for S {
 //         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 69486f46137..223c65737ad 100644
--- 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 f4db00dab59..d0f4e3bb60b 100644
--- 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 d2c713b320f..9400ae5050b 100644
--- 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 8e7207af0c6..ab62164e800 100644
--- 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 bc06ab67eaa..91643e07ed0 100644
--- 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 a0edcc82fe1..640dec0861d 100644
--- 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 69042fecc7d..5ee377569dd 100644
--- 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 da423163e84..1dbbd74cdf3 100644
--- 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 2087485b913..6b8018e4b22 100644
--- 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 4663b71bd7c..9a3cca54ae5 100644
--- 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 7d2868ee4ba..7f0e16eaa06 100644
--- 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 0156c1be7ed..7a17afee3e0 100644
--- 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 6e8cf4204ee..1df30995102 100644
--- 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 fd23d813452..d3482077305 100644
--- 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 f70f6519275..5eada97ed20 100644
--- 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 61dc1d20659..12d14df47df 100644
--- 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 @@ unsafe impl<'a, #[may_dangle] 'b> Drop for D1<'a, 'b> {
 //        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 @@ unsafe impl<'a, #[may_dangle] 'b> Drop for D1<'a, 'b> {
 //         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 @@ unsafe impl<'a, #[may_dangle] 'b> Drop for D1<'a, 'b> {
 //         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 5a9336e9659..9415e140d80 100644
--- 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 bfac6c739a3..b409d1fb667 100644
--- a/src/test/mir-opt/issue-41110.rs
+++ b/src/test/mir-opt/issue-41110.rs
@@ -35,7 +35,7 @@ impl S {
 }
 
 // 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 @@ impl S {
 //    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 @@ impl S {
 //    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 3f0f5068577..85cecc5070c 100644
--- 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 56c5dd3be47..02e9d39668d 100644
--- 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 873431505f5..2de3e7d704d 100644
--- 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 96fd29dfe2f..5c34479d259 100644
--- 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 c557763c004..8217befca6b 100644
--- 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/named-lifetimes-basic.rs b/src/test/mir-opt/nll/named-lifetimes-basic.rs
index c4f3a6fea53..e3f67d817f3 100644
--- a/src/test/mir-opt/nll/named-lifetimes-basic.rs
+++ b/src/test/mir-opt/nll/named-lifetimes-basic.rs
@@ -25,10 +25,10 @@ fn main() {
 }
 
 // END RUST SOURCE
-// START rustc.node4.nll.0.mir
+// START rustc.use_x.nll.0.mir
 // | '_#0r: {bb0[0], bb0[1], '_#0r}
 // | '_#1r: {bb0[0], bb0[1], '_#0r, '_#1r}
 // | '_#2r: {bb0[0], bb0[1], '_#2r}
 // ...
 // fn use_x(_1: &'_#0r mut i32, _2: &'_#1r u32, _3: &'_#0r u32, _4: &'_#2r u32) -> bool {
-// END rustc.node4.nll.0.mir
+// END rustc.use_x.nll.0.mir
diff --git a/src/test/mir-opt/nll/reborrow-basic.rs b/src/test/mir-opt/nll/reborrow-basic.rs
index 60a4da430b9..c3df0c840de 100644
--- 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 7792f0a36f3..f7276cb2979 100644
--- 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 4f4bb596e5f..6527df26eae 100644
--- 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 @@ unsafe impl<#[may_dangle] T> Drop for Wrap<T> {
 }
 
 // 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 0ddb745b61f..aedb3f562a6 100644
--- 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 @@ impl<T> Drop for Wrap<T> {
 }
 
 // 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 664298b9374..23809d176f6 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
@@ -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 4ae891f5b70..cada9c7b254 100644
--- 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 cff108246a5..ad3bbba8d08 100644
--- 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 370ab599eca..995639e20d6 100644
--- 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 7dbcf82af34..53cb82bb0f6 100644
--- 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 a97ce4e8cbe..f4d1caa6a95 100644
--- 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 aacf5a5ed0f..5f3dad5efde 100644
--- 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 d7d3e023c9e..50c410039e2 100644
--- a/src/test/mir-opt/validate_3.rs
+++ b/src/test/mir-opt/validate_3.rs
@@ -28,7 +28,7 @@ fn main() {
 }
 
 // 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 main() {
 //         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 3585ac0b8be..80224ddc586 100644
--- 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 ae09d72942e..a945b7dbc5f 100644
--- 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