Fix test-cargo-miri

Author: bjorn3

src/bin/miri.rs

@@ -225,14 +225,16 @@ impl rustc_driver::Callbacks for MiriCompilerCalls {
     }
 }
 
-struct MiriBeRustCompilerCalls {
-    target_crate: bool,
-}
+struct MiriBeRustCompilerCalls;
 
 impl rustc_driver::Callbacks for MiriBeRustCompilerCalls {
     #[allow(rustc::potential_query_instability)] // rustc_codegen_ssa (where this code is copied from) also allows this lint
     fn config(&mut self, config: &mut Config) {
-        if config.opts.prints.is_empty() && self.target_crate {
+        if config.opts.prints.is_empty() {
+            // Avoid warnings about unsupported crate types
+            #[allow(rustc::bad_opt_access)]
+            config.opts.crate_types.retain(|&c| c == CrateType::Executable || c == CrateType::Rlib);
+
             // Queries overridden here affect the data stored in `rmeta` files of dependencies,
             // which will be used later in non-`MIRI_BE_RUSTC` mode.
             config.override_queries = Some(|_, local_providers| {
@@ -299,16 +301,15 @@ impl rustc_driver::Callbacks for MiriBeRustCompilerCalls {
         _: &rustc_interface::interface::Compiler,
         tcx: TyCtxt<'tcx>,
     ) -> Compilation {
-        if self.target_crate {
-            // cargo-miri has patched the compiler flags to make these into check-only builds,
-            // but we are still emulating regular rustc builds, which would perform post-mono
-            // const-eval during collection. So let's also do that here, even if we might be
-            // running with `--emit=metadata`. In particular this is needed to make
-            // `compile_fail` doc tests trigger post-mono errors.
-            // In general `collect_and_partition_mono_items` is not safe to call in check-only
-            // builds, but we are setting `-Zalways-encode-mir` which avoids those issues.
-            let _ = tcx.collect_and_partition_mono_items(());
-        }
+        // cargo-miri has patched the compiler flags to make these into check-only builds,
+        // but we are still emulating regular rustc builds, which would perform post-mono
+        // const-eval during collection. So let's also do that here, even if we might be
+        // running with `--emit=metadata`. In particular this is needed to make
+        // `compile_fail` doc tests trigger post-mono errors.
+        // In general `collect_and_partition_mono_items` is not safe to call in check-only
+        // builds, but we are setting `-Zalways-encode-mir` which avoids those issues.
+        let _ = tcx.collect_and_partition_mono_items(());
+
         Compilation::Continue
     }
 }
@@ -430,32 +431,25 @@ fn main() {
 
     // If the environment asks us to actually be rustc, then do that.
     if let Some(crate_kind) = env::var_os("MIRI_BE_RUSTC") {
-        // Earliest rustc setup.
-        rustc_driver::install_ice_hook(rustc_driver::DEFAULT_BUG_REPORT_URL, |_| ());
-        rustc_driver::init_rustc_env_logger(&early_dcx);
-
-        let target_crate = if crate_kind == "target" {
-            true
-        } else if crate_kind == "host" {
-            false
+        if crate_kind == "host" {
+            rustc_driver::main();
+        } else if crate_kind == "target" {
         } else {
             panic!("invalid `MIRI_BE_RUSTC` value: {crate_kind:?}")
         };
 
+        // Earliest rustc setup.
+        rustc_driver::install_ice_hook(rustc_driver::DEFAULT_BUG_REPORT_URL, |_| ());
+        rustc_driver::init_rustc_env_logger(&early_dcx);
+
         let mut args = args;
-        // Don't insert `MIRI_DEFAULT_ARGS`, in particular, `--cfg=miri`, if we are building
-        // a "host" crate. That may cause procedural macros (and probably build scripts) to
-        // depend on Miri-only symbols, such as `miri_resolve_frame`:
-        // https://github.com/rust-lang/miri/issues/1760
-        if target_crate {
-            // Splice in the default arguments after the program name.
-            // Some options have different defaults in Miri than in plain rustc; apply those by making
-            // them the first arguments after the binary name (but later arguments can overwrite them).
-            args.splice(1..1, miri::MIRI_DEFAULT_ARGS.iter().map(ToString::to_string));
-        }
+        // Splice in the default arguments after the program name.
+        // Some options have different defaults in Miri than in plain rustc; apply those by making
+        // them the first arguments after the binary name (but later arguments can overwrite them).
+        args.splice(1..1, miri::MIRI_DEFAULT_ARGS.iter().map(ToString::to_string));
 
         // We cannot use `rustc_driver::main` as we want it to use `args` as the CLI arguments.
-        run_compiler_and_exit(&args, &mut MiriBeRustCompilerCalls { target_crate })
+        run_compiler_and_exit(&args, &mut MiriBeRustCompilerCalls)
     }
 
     // Add an ICE bug report hook.

test-cargo-miri/Cargo.lock

@@ -1,5 +1,5 @@
 [workspace]
-members = ["subcrate", "issue-1567", "exported-symbol-dep", "test-local-crate-detection"]
+members = ["cdylib", "subcrate", "issue-1567", "exported-symbol-dep", "test-local-crate-detection"]
 exclude = ["no-std-smoke"] # it wants to be panic="abort"
 
 [package]
@@ -10,7 +10,6 @@ edition = "2024"
 
 [dependencies]
 byteorder = "1.0"
-cdylib = { path = "cdylib" }
 exported_symbol = { path = "exported-symbol" }
 proc_macro_crate = { path = "proc-macro-crate" }
 issue_1567 = { path = "issue-1567" }

test-cargo-miri/Cargo.toml

@@ -1 +1 @@
-subcrate,issue_1567,exported_symbol_dep,test_local_crate_detection,cargo_miri_test,cdylib,exported_symbol,issue_1691,issue_1705,issue_rust_86261,proc_macro_crate
+cdylib,subcrate,issue_1567,exported_symbol_dep,test_local_crate_detection,cargo_miri_test,exported_symbol,issue_1691,issue_1705,issue_rust_86261,proc_macro_crate