Rollup of 6 pull requests

.github/workflows/ci.yml

@@ -34,7 +34,7 @@ jobs:
  pr:
  permissions:
  actions: write
- name: PR
+ name: "PR - ${{ matrix.name }}"
  env:
  CI_JOB_NAME: "${{ matrix.name }}"
  CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
@@ -159,7 +159,7 @@ jobs:
  auto:
  permissions:
  actions: write
- name: auto
+ name: "auto - ${{ matrix.name }}"
  env:
  CI_JOB_NAME: "${{ matrix.name }}"
  CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
@@ -578,7 +578,7 @@ jobs:
  try:
  permissions:
  actions: write
- name: try
+ name: "try - ${{ matrix.name }}"
  env:
  CI_JOB_NAME: "${{ matrix.name }}"
  CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse

Cargo.lock

@@ -915,9 +915,9 @@ dependencies = [
 
 [[package]]
 name = "compiler_builtins"
-version = "0.1.89"
+version = "0.1.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc9c2080d347a2c316518840ac9194644a9993dfa1e9778ef38979a339f5d8b"
+checksum = "571298a3cce7e2afbd3d61abb91a18667d5ab25993ec577a88ee8ac45f00cc3a"
 dependencies = [
  "cc",
  "rustc-std-workspace-core",

library/std/Cargo.toml

@@ -16,7 +16,7 @@ panic_unwind = { path = "../panic_unwind", optional = true }
 panic_abort = { path = "../panic_abort" }
 core = { path = "../core" }
 libc = { version = "0.2.140", default-features = false, features = ['rustc-dep-of-std'] }
-compiler_builtins = { version = "0.1.87" }
+compiler_builtins = { version = "0.1.91" }
 profiler_builtins = { path = "../profiler_builtins", optional = true }
 unwind = { path = "../unwind" }
 hashbrown = { version = "0.12", default-features = false, features = ['rustc-dep-of-std'] }

library/std/src/sys/hermit/net.rs

@@ -1,7 +1,7 @@
 #![allow(dead_code)]
 
 use crate::cmp;
-use crate::io::{self, IoSlice, IoSliceMut};
+use crate::io::{self, BorrowedBuf, BorrowedCursor, IoSlice, IoSliceMut};
 use crate::mem;
 use crate::net::{Shutdown, SocketAddr};
 use crate::os::hermit::io::{AsFd, AsRawFd, BorrowedFd, FromRawFd, RawFd};
@@ -146,18 +146,35 @@ impl Socket {
  Ok(Socket(unsafe { FileDesc::from_raw_fd(fd) }))
  }
 
- fn recv_with_flags(&self, buf: &mut [u8], flags: i32) -> io::Result<usize> {
- let ret =
- cvt(unsafe { netc::recv(self.0.as_raw_fd(), buf.as_mut_ptr(), buf.len(), flags) })?;
- Ok(ret as usize)
+ fn recv_with_flags(&self, mut buf: BorrowedCursor<'_>, flags: i32) -> io::Result<()> {
+ let ret = cvt(unsafe {
+ netc::recv(
+ self.0.as_raw_fd(),
+ buf.as_mut().as_mut_ptr() as *mut u8,
+ buf.capacity(),
+ flags,
+ )
+ })?;
+ unsafe {
+ buf.advance(ret as usize);
+ }
+ Ok(())
  }
 
  pub fn read(&self, buf: &mut [u8]) -> io::Result<usize> {
- self.recv_with_flags(buf, 0)
+ let mut buf = BorrowedBuf::from(buf);
+ self.recv_with_flags(buf.unfilled(), 0)?;
+ Ok(buf.len())
  }
 
  pub fn peek(&self, buf: &mut [u8]) -> io::Result<usize> {
- self.recv_with_flags(buf, netc::MSG_PEEK)
+ let mut buf = BorrowedBuf::from(buf);
+ self.recv_with_flags(buf.unfilled(), netc::MSG_PEEK)?;
+ Ok(buf.len())
+ }
+
+ pub fn read_buf(&self, buf: BorrowedCursor<'_>) -> io::Result<()> {
+ self.recv_with_flags(buf, 0)
  }
 
  pub fn read_vectored(&self, bufs: &mut [IoSliceMut<'_>]) -> io::Result<usize> {

src/bootstrap/bootstrap.py

@@ -741,6 +741,9 @@ def build_bootstrap(self, color, verbose_count):
  env["LIBRARY_PATH"] = os.path.join(self.bin_root(), "lib") + \
  (os.pathsep + env["LIBRARY_PATH"]) \
  if "LIBRARY_PATH" in env else ""
+ env["LIBPATH"] = os.path.join(self.bin_root(), "lib") + \
+ (os.pathsep + env["LIBPATH"]) \
+ if "LIBPATH" in env else ""
 
  # Export Stage0 snapshot compiler related env variables
  build_section = "target.{}".format(self.build)

src/bootstrap/compile.rs

@@ -20,7 +20,7 @@ use serde_derive::Deserialize;
 
 use crate::builder::crate_description;
 use crate::builder::Cargo;
-use crate::builder::{Builder, Kind, RunConfig, ShouldRun, Step};
+use crate::builder::{Builder, Kind, PathSet, RunConfig, ShouldRun, Step, TaskPath};
 use crate::cache::{Interned, INTERNER};
 use crate::config::{LlvmLibunwind, RustcLto, TargetSelection};
 use crate::dist;
@@ -995,6 +995,44 @@ pub struct CodegenBackend {
  pub backend: Interned<String>,
 }
 
+fn needs_codegen_config(run: &RunConfig<'_>) -> bool {
+ let mut needs_codegen_cfg = false;
+ for path_set in &run.paths {
+ needs_codegen_cfg = match path_set {
+ PathSet::Set(set) => set.iter().any(|p| is_codegen_cfg_needed(p, run)),
+ PathSet::Suite(suite) => is_codegen_cfg_needed(&suite, run),
+ }
+ }
+ needs_codegen_cfg
+}
+
+const CODEGEN_BACKEND_PREFIX: &str = "rustc_codegen_";
+
+fn is_codegen_cfg_needed(path: &TaskPath, run: &RunConfig<'_>) -> bool {
+ if path.path.to_str().unwrap().contains(&CODEGEN_BACKEND_PREFIX) {
+ let mut needs_codegen_backend_config = true;
+ for &backend in &run.builder.config.rust_codegen_backends {
+ if path
+ .path
+ .to_str()
+ .unwrap()
+ .ends_with(&(CODEGEN_BACKEND_PREFIX.to_owned() + &backend))
+ {
+ needs_codegen_backend_config = false;
+ }
+ }
+ if needs_codegen_backend_config {
+ run.builder.info(
+ "Warning: no codegen-backends config matched the requested path to build a codegen backend. \
+ Help: add backend to codegen-backends in config.toml.",
+ );
+ return true;
+ }
+ }
+
+ return false;
+}
+
 impl Step for CodegenBackend {
  type Output = ();
  const ONLY_HOSTS: bool = true;
@@ -1006,6 +1044,10 @@ impl Step for CodegenBackend {
  }
 
  fn make_run(run: RunConfig<'_>) {
+ if needs_codegen_config(&run) {
+ return;
+ }
+
  for &backend in &run.builder.config.rust_codegen_backends {
  if backend == "llvm" {
  continue; // Already built as part of rustc

src/bootstrap/config.rs

@@ -227,25 +227,34 @@ pub struct Config {
  pub reuse: Option<PathBuf>,
  pub cargo_native_static: bool,
  pub configure_args: Vec<String>,
+ pub out: PathBuf,
+ pub rust_info: channel::GitInfo,
 
  // These are either the stage0 downloaded binaries or the locally installed ones.
  pub initial_cargo: PathBuf,
  pub initial_rustc: PathBuf,
+
  #[cfg(not(test))]
  initial_rustfmt: RefCell<RustfmtState>,
  #[cfg(test)]
  pub initial_rustfmt: RefCell<RustfmtState>,
- pub out: PathBuf,
- pub rust_info: channel::GitInfo,
 }
 
 #[derive(Default, Deserialize)]
 #[cfg_attr(test, derive(Clone))]
 pub struct Stage0Metadata {
+ pub compiler: CompilerMetadata,
  pub config: Stage0Config,
  pub checksums_sha256: HashMap<String, String>,
  pub rustfmt: Option<RustfmtMetadata>,
 }
+#[derive(Default, Deserialize)]
+#[cfg_attr(test, derive(Clone))]
+pub struct CompilerMetadata {
+ pub date: String,
+ pub version: String,
+}
+
 #[derive(Default, Deserialize)]
 #[cfg_attr(test, derive(Clone))]
 pub struct Stage0Config {
@@ -1000,10 +1009,10 @@ impl Config {
  config.out = crate::util::absolute(&config.out);
  }
 
- config.initial_rustc = build
- .rustc
- .map(PathBuf::from)
-  .unwrap_or_else(|| config.out.join(config.build.triple).join("stage0/bin/rustc"));
+ config.initial_rustc = build.rustc.map(PathBuf::from).unwrap_or_else(|| {
+ config.download_beta_toolchain();
+ config.out.join(config.build.triple).join("stage0/bin/rustc")
+ });
  config.initial_cargo = build
  .cargo
  .map(PathBuf::from)

src/bootstrap/download.rs

@@ -367,26 +367,70 @@ impl Config {
 
  pub(crate) fn download_ci_rustc(&self, commit: &str) {
  self.verbose(&format!("using downloaded stage2 artifacts from CI (commit {commit})"));
+
  let version = self.artifact_version_part(commit);
+ // download-rustc doesn't need its own cargo, it can just use beta's. But it does need the
+ // `rustc_private` crates for tools.
+ let extra_components = ["rustc-dev"];
+
+ self.download_toolchain(
+ &version,
+ "ci-rustc",
+ commit,
+ &extra_components,
+ Self::download_ci_component,
+ );
+ }
+
+ pub(crate) fn download_beta_toolchain(&self) {
+ self.verbose(&format!("downloading stage0 beta artifacts"));
+
+ let date = &self.stage0_metadata.compiler.date;
+ let version = &self.stage0_metadata.compiler.version;
+ let extra_components = ["cargo"];
+
+ let download_beta_component = |config: &Config, filename, prefix: &_, date: &_| {
+ config.download_component(DownloadSource::Dist, filename, prefix, date, "stage0")
+ };
+
+ self.download_toolchain(
+ version,
+ "stage0",
+ date,
+ &extra_components,
+ download_beta_component,
+ );
+ }
+
+ fn download_toolchain(
+ &self,
+ // FIXME(ozkanonur) use CompilerMetadata instead of `version: &str`
+ version: &str,
+ sysroot: &str,
+ stamp_key: &str,
+ extra_components: &[&str],
+ download_component: fn(&Config, String, &str, &str),
+ ) {
  let host = self.build.triple;
- let bin_root = self.out.join(host).join("ci-rustc");
+ let bin_root = self.out.join(host).join(sysroot);
  let rustc_stamp = bin_root.join(".rustc-stamp");
 
- if !bin_root.join("bin").join("rustc").exists() || program_out_of_date(&rustc_stamp, commit)
+ if !bin_root.join("bin").join("rustc").exists()
+ || program_out_of_date(&rustc_stamp, stamp_key)
  {
  if bin_root.exists() {
  t!(fs::remove_dir_all(&bin_root));
  }
  let filename = format!("rust-std-{version}-{host}.tar.xz");
  let pattern = format!("rust-std-{host}");
- self.download_ci_component(filename, &pattern, commit);
+ download_component(self, filename, &pattern, stamp_key);
  let filename = format!("rustc-{version}-{host}.tar.xz");
- self.download_ci_component(filename, "rustc", commit);
- // download-rustc doesn't need its own cargo, it can just use beta's.
- let filename = format!("rustc-dev-{version}-{host}.tar.xz");
- self.download_ci_component(filename, "rustc-dev", commit);
- let filename = format!("rust-src-{version}.tar.xz");
- self.download_ci_component(filename, "rust-src", commit);
+ download_component(self, filename, "rustc", stamp_key);
+
+ for component in extra_components {
+  let filename = format!("{component}-{version}-{host}.tar.xz");
+  download_component(self, filename, component, stamp_key);
+ }
 
  if self.should_fix_bins_and_dylibs() {
  self.fix_bin_or_dylib(&bin_root.join("bin").join("rustc"));
@@ -403,7 +447,7 @@ impl Config {
  }
  }
 
- t!(fs::write(rustc_stamp, commit));
+ t!(fs::write(rustc_stamp, stamp_key));
  }
  }
 

src/bootstrap/dylib_util.rs

@@ -12,6 +12,8 @@ pub fn dylib_path_var() -> &'static str {
  "DYLD_LIBRARY_PATH"
  } else if cfg!(target_os = "haiku") {
  "LIBRARY_PATH"
+ } else if cfg!(target_os = "aix") {
+ "LIBPATH"
  } else {
  "LD_LIBRARY_PATH"
  }

src/bootstrap/test.rs

@@ -1133,7 +1133,7 @@ impl Step for Tidy {
  if builder.config.channel == "dev" || builder.config.channel == "nightly" {
  builder.info("fmt check");
  if builder.initial_rustfmt().is_none() {
- let inferred_rustfmt_dir = builder.config.initial_rustc.parent().unwrap();
+ let inferred_rustfmt_dir = builder.initial_rustc.parent().unwrap();
  eprintln!(
  "\
 error: no `rustfmt` binary found in {PATH}

src/ci/github-actions/ci.yml

@@ -284,7 +284,7 @@ jobs:
  permissions:
  actions: write # for rust-lang/simpleinfra/github-actions/cancel-outdated-builds
  <<: *base-ci-job
- name: PR
+ name: PR - ${{ matrix.name }}
  env:
  <<: [*shared-ci-variables, *public-variables]
  if: github.event_name == 'pull_request'
@@ -312,7 +312,7 @@ jobs:
  permissions:
  actions: write # for rust-lang/simpleinfra/github-actions/cancel-outdated-builds
  <<: *base-ci-job
- name: auto
+ name: auto - ${{ matrix.name }}
  env:
  <<: [*shared-ci-variables, *prod-variables]
  if: github.event_name == 'push' && github.ref == 'refs/heads/auto' && github.repository == 'rust-lang-ci/rust'
@@ -741,7 +741,7 @@ jobs:
  permissions:
  actions: write # for rust-lang/simpleinfra/github-actions/cancel-outdated-builds
  <<: *base-ci-job
- name: try
+ name: try - ${{ matrix.name }}
  env:
  <<: [*shared-ci-variables, *prod-variables]
  if: github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust'

src/tools/compiletest/src/util.rs

@@ -156,6 +156,8 @@ pub fn dylib_env_var() -> &'static str {
  "DYLD_LIBRARY_PATH"
  } else if cfg!(target_os = "haiku") {
  "LIBRARY_PATH"
+ } else if cfg!(target_os = "aix") {
+ "LIBPATH"
  } else {
  "LD_LIBRARY_PATH"
  }