Auto merge of rust-lang#2564 - RalfJung:no-more-xargo, r=oli-obk

RalfJung · RalfJung · commit 6c77735fce07 · 2022-10-02T15:03:34.000+02:00
diff --git a/src/tools/miri/.github/workflows/ci.yml b/src/tools/miri/.github/workflows/ci.yml
@@ -57,15 +57,14 @@ jobs:
             # contains package information of crates installed via `cargo install`.
             ~/.cargo/.crates.toml
             ~/.cargo/.crates2.json
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock', 'cargo-miri/src/version.rs') }}
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: ${{ runner.os }}-cargo
 
-      - name: Install rustup-toolchain-install-master and xargo
+      - name: Install rustup-toolchain-install-master
         if: ${{ steps.cache.outputs.cache-hit == 'false' }}
         shell: bash
         run: |
           cargo install -f rustup-toolchain-install-master
-          cargo install -f xargo
 
       - name: Install "master" toolchain
         shell: bash
diff --git a/src/tools/miri/CONTRIBUTING.md b/src/tools/miri/CONTRIBUTING.md
@@ -38,7 +38,7 @@ for you. If you don't want all of these to happen, you can add individual `.auto
 ## Building and testing Miri
 
 Invoking Miri requires getting a bunch of flags right and setting up a custom
-sysroot with xargo. The `miri` script takes care of that for you. With the
+sysroot. The `miri` script takes care of that for you. With the
 build environment prepared, compiling Miri is just one command away:
 
 ```
diff --git a/src/tools/miri/README.md b/src/tools/miri/README.md
@@ -450,7 +450,7 @@ binaries, and as such worth documenting:
   some compiler flags to prepare the code for interpretation; with `host`, this is not done.
   This environment variable is useful to be sure that the compiled `rlib`s are compatible
   with Miri.
-* `MIRI_CALLED_FROM_XARGO` is set during the Miri-induced `xargo` sysroot build,
+* `MIRI_CALLED_FROM_SETUP` is set during the Miri sysroot build,
   which will re-invoke `cargo-miri` as the `rustc` to use for this build.
 * `MIRI_CALLED_FROM_RUSTDOC` when set to any value tells `cargo-miri` that it is
   running as a child process of `rustdoc`, which invokes it twice for each doc-test
diff --git a/src/tools/miri/cargo-miri/Cargo.lock b/src/tools/miri/cargo-miri/Cargo.lock
@@ -35,6 +35,7 @@ version = "0.1.0"
 dependencies = [
  "cargo_metadata",
  "directories",
+ "rustc-build-sysroot",
  "rustc-workspace-hack",
  "rustc_version",
  "serde",
@@ -142,6 +143,12 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "fuchsia-cprng"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+
 [[package]]
 name = "getrandom"
 version = "0.2.3"
@@ -322,6 +329,43 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "rand"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
+dependencies = [
+ "fuchsia-cprng",
+ "libc",
+ "rand_core 0.3.1",
+ "rdrand",
+ "winapi",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+dependencies = [
+ "rand_core 0.4.2",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
+
+[[package]]
+name = "rdrand"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
+dependencies = [
+ "rand_core 0.3.1",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.2.10"
@@ -341,6 +385,26 @@ dependencies = [
  "redox_syscall",
 ]
 
+[[package]]
+name = "remove_dir_all"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "rustc-build-sysroot"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea9e30aa5a34196fe1b2899704f1e1dccbc91fa0981f6c36b749899f924fcadd"
+dependencies = [
+ "anyhow",
+ "rustc_version",
+ "tempdir",
+]
+
 [[package]]
 name = "rustc-workspace-hack"
 version = "1.0.0"
@@ -419,6 +483,16 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "tempdir"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
+dependencies = [
+ "rand",
+ "remove_dir_all",
+]
+
 [[package]]
 name = "thiserror"
 version = "1.0.30"
diff --git a/src/tools/miri/cargo-miri/Cargo.toml b/src/tools/miri/cargo-miri/Cargo.toml
@@ -18,6 +18,7 @@ directories = "3"
 rustc_version = "0.4"
 serde_json = "1.0.40"
 cargo_metadata = "0.15.0"
+rustc-build-sysroot = "0.2.1"
 
 # A noop dependency that changes in the Rust repository, it's a bit of a hack.
 # See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust`
diff --git a/src/tools/miri/cargo-miri/src/main.rs b/src/tools/miri/cargo-miri/src/main.rs
@@ -6,7 +6,6 @@ mod util;
 mod arg;
 mod phases;
 mod setup;
-mod version;
 
 use std::{env, iter};
 
@@ -22,8 +21,8 @@ fn main() {
     // Dispatch to `cargo-miri` phase. Here is a rough idea of "who calls who".
     //
     // Initially, we are invoked as `cargo-miri miri run/test`. We first run the setup phase:
-    // - We call `xargo`, and set `RUSTC` back to us, together with `MIRI_CALLED_FROM_XARGO`,
-    //   so that xargo's rustc invocations end up in `phase_rustc` with `RustcPhase::Setup`.
+    // - We use `rustc-build-sysroot`, and set `RUSTC` back to us, together with `MIRI_CALLED_FROM_SETUP`,
+    //   so that the sysroot build rustc invocations end up in `phase_rustc` with `RustcPhase::Setup`.
     //   There we then call the Miri driver with `MIRI_BE_RUSTC` to perform the actual build.
     //
     // Then we call `cargo run/test`, exactly forwarding all user flags, plus some configuration so
@@ -52,7 +51,7 @@ fn main() {
     //     the Miri driver for interpretation.
 
     // Dispatch running as part of sysroot compilation.
-    if env::var_os("MIRI_CALLED_FROM_XARGO").is_some() {
+    if env::var_os("MIRI_CALLED_FROM_SETUP").is_some() {
         phase_rustc(args, RustcPhase::Setup);
         return;
     }
diff --git a/src/tools/miri/cargo-miri/src/phases.rs b/src/tools/miri/cargo-miri/src/phases.rs
@@ -7,6 +7,8 @@ use std::io::BufReader;
 use std::path::PathBuf;
 use std::process::Command;
 
+use rustc_version::VersionMeta;
+
 use crate::{setup::*, util::*};
 
 const CARGO_MIRI_HELP: &str = r#"Runs binary crates and tests in Miri
@@ -90,12 +92,14 @@ pub fn phase_cargo_miri(mut args: impl Iterator<Item = String>) {
     let verbose = num_arg_flag("-v");
 
     // Determine the involved architectures.
-    let host = version_info().host;
+    let rustc_version = VersionMeta::for_command(miri_for_host())
+        .expect("failed to determine underlying rustc version of Miri");
+    let host = &rustc_version.host;
     let target = get_arg_flag_value("--target");
-    let target = target.as_ref().unwrap_or(&host);
+    let target = target.as_ref().unwrap_or(host);
 
     // We always setup.
-    setup(&subcommand, &host, target);
+    setup(&subcommand, target, &rustc_version);
 
     // Invoke actual cargo for the job, but with different flags.
     // We re-use `cargo test` and `cargo run`, which makes target and binary handling very easy but
@@ -146,7 +150,7 @@ pub fn phase_cargo_miri(mut args: impl Iterator<Item = String>) {
     if get_arg_flag_value("--target").is_none() {
         // No target given. Explicitly pick the host.
         cmd.arg("--target");
-        cmd.arg(&host);
+        cmd.arg(host);
     }
 
     // Set ourselves as runner for al binaries invoked by cargo.
@@ -204,7 +208,7 @@ pub fn phase_cargo_miri(mut args: impl Iterator<Item = String>) {
 
 #[derive(Debug, Copy, Clone, PartialEq)]
 pub enum RustcPhase {
-    /// `rustc` called via `xargo` for sysroot build.
+    /// `rustc` called during sysroot build.
     Setup,
     /// `rustc` called by `cargo` for regular build.
     Build,
@@ -264,7 +268,7 @@ pub fn phase_rustc(mut args: impl Iterator<Item = String>, phase: RustcPhase) {
     let verbose = std::env::var("MIRI_VERBOSE")
         .map_or(0, |verbose| verbose.parse().expect("verbosity flag must be an integer"));
     let target_crate = is_target_crate();
-    // Determine whether this is cargo/xargo invoking rustc to get some infos.
+    // Determine whether this is cargo invoking rustc to get some infos.
     let info_query = get_arg_flag_value("--print").is_some() || has_arg_flag("-vV");
 
     let store_json = |info: CrateRunInfo| {
diff --git a/src/tools/miri/cargo-miri/src/setup.rs b/src/tools/miri/cargo-miri/src/setup.rs
diff --git a/src/tools/miri/cargo-miri/src/util.rs b/src/tools/miri/cargo-miri/src/util.rs
diff --git a/src/tools/miri/cargo-miri/src/version.rs b/src/tools/miri/cargo-miri/src/version.rs
