Move -Zjit-mode from bin/miri.rs to cargo-miri

Author: bjorn3

src/tools/miri/cargo-miri/src/phases.rs

@@ -601,6 +601,8 @@ pub fn phase_runner(mut binary_args: impl Iterator<Item = String>, phase: Runner
         cmd.args(args);
     }
 
+    cmd.arg("-Zjit-mode");
+
     // Then pass binary arguments.
     cmd.arg("--");
     cmd.args(&binary_args);

src/tools/miri/src/bin/miri.rs

@@ -549,7 +549,6 @@ fn main() -> ExitCode {
 
     let mut rustc_args = vec![];
     let mut after_dashdash = false;
-    let mut guest_args = vec![];
 
     // Note that we require values to be given with `=`, not with a space.
     // This matches how rustc parses `-Z`.
@@ -562,9 +561,10 @@ fn main() -> ExitCode {
             rustc_args.extend(miri::MIRI_DEFAULT_ARGS.iter().map(ToString::to_string));
         } else if after_dashdash {
             // Everything that comes after `--` is forwarded to the interpreted crate.
-            guest_args.push(arg);
+            rustc_args.push(arg);
         } else if arg == "--" {
             after_dashdash = true;
+            rustc_args.push("--".to_owned());
         } else if arg == "-Zmiri-disable-validation" {
             miri_config.validation = ValidationMode::No;
         } else if arg == "-Zmiri-recursive-validation" {
@@ -819,9 +819,6 @@ fn main() -> ExitCode {
             );
         }
     }
-    rustc_args.push("-Zjit-mode".to_owned());
-    rustc_args.push("--".to_owned());
-    rustc_args.extend(guest_args);
 
     run_compiler_and_exit(&rustc_args, &mut MiriCompilerCalls::new(miri_config, many_seeds))
 }

src/tools/miri/tests/ui.rs

@@ -202,6 +202,7 @@ fn run_tests(
         }
     }
     config.program.args.push("-Zui-testing".into());
+    config.program.args.push("-Zjit-mode".into());
 
     // If we're testing the native-lib functionality, then build the shared object file for testing
     // external C function calls and push the relevant compiler flag.