Rollup merge of rust-lang#156524 - Zalathar:no-pre-codegen, r=oli-obk

Remove the dummy `PreCodegen` mir-opt pass, and use `runtime-optimized` instead

- Alternative to rust-lang#156358.

The `PreCodegen` pass doesn't do anything on its own; it was only serving as a marker to allow `-Zdump-mir` and mir-opt tests to easily dump the final MIR just before codegen.

However, rust-lang#156358 (comment) pointed out that the `runtime-optimized` phase transition should dump the same MIR, so there shouldn't be any need for a separate *PreCodegen* pass.

---
r? oli-obk (or compiler)

Author: JonathanBrouwer

Cargo.lock

@@ -3922,7 +3922,6 @@ dependencies = [
  "rustc_metadata",
  "rustc_middle",
  "rustc_mir_build",
- "rustc_mir_transform",
  "rustc_parse",
  "rustc_public",
  "rustc_resolve",

compiler/rustc_driver_impl/Cargo.toml

@@ -27,7 +27,6 @@ rustc_macros = { path = "../rustc_macros" }
 rustc_metadata = { path = "../rustc_metadata" }
 rustc_middle = { path = "../rustc_middle" }
 rustc_mir_build = { path = "../rustc_mir_build" }
-rustc_mir_transform = { path = "../rustc_mir_transform" }
 rustc_parse = { path = "../rustc_parse" }
 rustc_public = { path = "../rustc_public", features = ["rustc_internal"] }
 rustc_resolve = { path = "../rustc_resolve" }

compiler/rustc_driver_impl/src/lib.rs

@@ -6,6 +6,7 @@
 
 // tidy-alphabetical-start
 #![feature(decl_macro)]
+#![feature(file_buffered)]
 #![feature(panic_backtrace_config)]
 #![feature(panic_update_hook)]
 #![feature(trim_prefix_suffix)]
@@ -333,7 +334,7 @@ pub fn run_compiler(at_args: &[String], callbacks: &mut (dyn Callbacks + Send))
             }
 
             if tcx.sess.opts.output_types.contains_key(&OutputType::Mir) {
-                if let Err(error) = rustc_mir_transform::dump_mir::emit_mir(tcx) {
+                if let Err(error) = pretty::emit_mir(tcx) {
                     tcx.dcx().emit_fatal(CantEmitMIR { error });
                 }
             }

compiler/rustc_driver_impl/src/pretty.rs

@@ -2,6 +2,8 @@
 
 use std::cell::Cell;
 use std::fmt::Write;
+use std::fs::File;
+use std::io;
 
 use rustc_ast as ast;
 use rustc_ast_pretty::pprust as pprust_ast;
@@ -12,7 +14,7 @@ use rustc_middle::ty::{self, TyCtxt};
 use rustc_mir_build::thir::print::{thir_flat, thir_tree};
 use rustc_public::rustc_internal::pretty::write_smir_pretty;
 use rustc_session::Session;
-use rustc_session::config::{OutFileName, PpHirMode, PpMode, PpSourceMode};
+use rustc_session::config::{OutFileName, OutputType, PpHirMode, PpMode, PpSourceMode};
 use rustc_span::{FileName, Ident};
 use tracing::debug;
 
@@ -340,3 +342,21 @@ pub fn print<'tcx>(sess: &Session, ppm: PpMode, ex: PrintExtra<'tcx>) {
 
     write_or_print(&out, sess);
 }
+
+/// Implementation of `--emit=mir`.
+pub fn emit_mir(tcx: TyCtxt<'_>) -> io::Result<()> {
+    match tcx.output_filenames(()).path(OutputType::Mir) {
+        OutFileName::Stdout => {
+            let mut f = io::stdout();
+            write_mir_pretty(tcx, &mut f)?;
+        }
+        OutFileName::Real(path) => {
+            let mut f = File::create_buffered(&path)?;
+            write_mir_pretty(tcx, &mut f)?;
+            if tcx.sess.opts.json_artifact_notifications {
+                tcx.dcx().emit_artifact_notification(&path, "mir");
+            }
+        }
+    }
+    Ok(())
+}

compiler/rustc_mir_transform/src/dump_mir.rs

@@ -2,7 +2,6 @@
 #![feature(box_patterns)]
 #![feature(const_type_name)]
 #![feature(cow_is_borrowed)]
-#![feature(file_buffered)]
 #![feature(impl_trait_in_assoc_type)]
 #![feature(iterator_try_collect)]
 #![feature(try_blocks)]
@@ -91,8 +90,6 @@ macro_rules! declare_passes {
 
         static PASS_NAMES: LazyLock<FxIndexSet<&str>> = LazyLock::new(|| {
             let mut set = FxIndexSet::default();
-            // Fake marker pass
-            set.insert("PreCodegen");
             $(
                 $(
                     set.extend(pass_names!($mod_name : $pass_name $( { $($ident),* } )? ));
@@ -145,7 +142,6 @@ declare_passes! {
     };
     mod deref_separator : Derefer;
     mod dest_prop : DestinationPropagation;
-    pub mod dump_mir : Marker;
     mod early_otherwise_branch : EarlyOtherwiseBranch;
     mod erase_deref_temps : EraseDerefTemps;
     mod elaborate_box_derefs : ElaborateBoxDerefs;
@@ -771,8 +767,6 @@ pub(crate) fn run_optimization_passes<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body<'
             // Cleanup for human readability, off by default.
             &prettify::ReorderBasicBlocks,
             &prettify::ReorderLocals,
-            // Dump the end result for testing and debugging purposes.
-            &dump_mir::Marker("PreCodegen"),
         ],
         Some(MirPhase::Runtime(RuntimePhase::Optimized)),
         optimizations,

compiler/rustc_mir_transform/src/lib.rs

@@ -1,4 +1,4 @@
-// MIR for `foo` after PreCodegen
+// MIR for `foo` after runtime-optimized
 
 fn foo(_1: Option<String>) -> i32 {
     debug s => _1;

…patterns/string.foo.PreCodegen.after.mir …s/string.foo.runtime-optimized.after.mirtests/mir-opt/building/match/deref-patterns/string.foo.PreCodegen.after.mir renamed to tests/mir-opt/building/match/deref-patterns/string.foo.runtime-optimized.after.mir tests/mir-opt/building/match/deref-patterns/string.foo.PreCodegen.after.mir renamed to tests/mir-opt/building/match/deref-patterns/string.foo.runtime-optimized.after.mir

@@ -4,7 +4,7 @@
 #![feature(deref_patterns)]
 #![crate_type = "lib"]
 
-// EMIT_MIR string.foo.PreCodegen.after.mir
+// EMIT_MIR string.foo.runtime-optimized.after.mir
 pub fn foo(s: Option<String>) -> i32 {
     match s {
         Some("a") => 1234,

tests/mir-opt/building/match/deref-patterns/string.rs

@@ -7,7 +7,7 @@ fn get_bool(c: bool) -> bool {
     c
 }
 
-// EMIT_MIR while_storage.while_loop.PreCodegen.after.mir
+// EMIT_MIR while_storage.while_loop.runtime-optimized.after.mir
 fn while_loop(c: bool) {
     // CHECK-LABEL: fn while_loop(
     // CHECK: bb0: {

tests/mir-opt/building/while_storage.rs

@@ -1,4 +1,4 @@
-// MIR for `while_loop` after PreCodegen
+// MIR for `while_loop` after runtime-optimized
 
 fn while_loop(_1: bool) -> () {
     debug c => _1;