add crate name to mir dumps

Author: xldenis

fuckyou.rb

@@ -0,0 +1,7 @@
+Dir.glob('src/test/mir-opt/**/*.rs').each do |f|
+  puts f
+  t = File.read(f)
+  b = File.basename(f, ".rs")
+  t.gsub!(/\/\/ EMIT_MIR rustc/, "// EMIT_MIR " + b)
+  File.open(f, "w") { |f| f.puts t }
+end

omg.mir

@@ -0,0 +1,2 @@
+// EMIT_MIR rustc.OMG
+test 123

src/librustc_mir/util/pretty.rs

@@ -177,6 +177,7 @@ fn dump_path(
     let mut file_path = PathBuf::new();
     file_path.push(Path::new(&tcx.sess.opts.debugging_opts.dump_mir_dir));
 
+    let crate_name = tcx.crate_name(source.def_id().krate);
     let item_name = tcx.def_path(source.def_id()).to_filename_friendly_no_crate();
     // All drop shims have the same DefId, so we have to add the type
     // to get unique file names.
@@ -196,7 +197,7 @@ fn dump_path(
     };
 
     let file_name = format!(
-        "rustc.{}{}{}{}.{}.{}.{}",
+        "{}.{}{}{}{}.{}.{}.{}", crate_name,
         item_name, shim_disambiguator, promotion_id, pass_num, pass_name, disambiguator, extension,
     );
 

src/test/mir-opt/address-of.rs

@@ -1,4 +1,4 @@
-// EMIT_MIR rustc.address_of_reborrow.SimplifyCfg-initial.after.mir
+// EMIT_MIR address_of.address_of_reborrow.SimplifyCfg-initial.after.mir
 
 fn address_of_reborrow() {
     let y = &[0; 10];
@@ -37,7 +37,7 @@ fn address_of_reborrow() {
 }
 
 // The normal borrows here should be preserved
-// EMIT_MIR rustc.borrow_and_cast.SimplifyCfg-initial.after.mir
+// EMIT_MIR address_of.borrow_and_cast.SimplifyCfg-initial.after.mir
 fn borrow_and_cast(mut x: i32) {
     let p = &x as *const i32;
     let q = &mut x as *const i32;

src/test/mir-opt/address-of/rustc.address_of_reborrow.SimplifyCfg-initial.after.mir renamed to src/test/mir-opt/address-of/address_of.address_of_reborrow.SimplifyCfg-initial.after.mir

@@ -8,7 +8,7 @@ unsafe fn foo(z: *mut usize) -> u32 {
 }
 
 // EMIT_MIR_FOR_EACH_BIT_WIDTH
-// EMIT_MIR rustc.main.SimplifyCfg-elaborate-drops.after.mir
+// EMIT_MIR array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.mir
 fn main() {
     let mut x = [42, 43, 44];
     let mut y = 1;

src/test/mir-opt/address-of/rustc.borrow_and_cast.SimplifyCfg-initial.after.mir renamed to src/test/mir-opt/address-of/address_of.borrow_and_cast.SimplifyCfg-initial.after.mir

@@ -1,6 +1,6 @@
 // this tests move up progration, which is not yet implemented
 
-// EMIT_MIR rustc.main.SimplifyCfg-initial.after.mir
+// EMIT_MIR basic_assignment.main.SimplifyCfg-initial.after.mir
 
 // Check codegen for assignments (`a = b`) where the left-hand-side is
 // not yet initialized. Assignments tend to be absent in simple code,