Merge commit '3b6080cb20924f0c4f94e47bbbbfcae8b07d82e5' into sync_cg_clif-2026-04-28

Author: bjorn3

.github/workflows/main.yml

@@ -242,7 +242,8 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     if: ${{ github.ref == 'refs/heads/main' }}
-    needs: [todo_check, rustfmt, test, bench, dist]
+    # FIXME add bench back once rust-lang/cargo#16925 has been fixed
+    needs: [todo_check, rustfmt, test, dist]
 
     permissions:
       contents: write # for creating the dev tag and release

Cargo.lock

@@ -8,28 +8,28 @@ crate-type = ["dylib"]
 
 [dependencies]
 # These have to be in sync with each other
-cranelift-codegen = { version = "0.130.0", default-features = false, features = ["std", "timing", "unwind", "all-native-arch"] }
-cranelift-frontend = { version = "0.130.0" }
-cranelift-module = { version = "0.130.0" }
-cranelift-native = { version = "0.130.0" }
-cranelift-jit = { version = "0.130.0", optional = true }
-cranelift-object = { version = "0.130.0" }
+cranelift-codegen = { version = "0.131.0", default-features = false, features = ["std", "timing", "unwind", "all-native-arch"] }
+cranelift-frontend = { version = "0.131.0" }
+cranelift-module = { version = "0.131.0" }
+cranelift-native = { version = "0.131.0" }
+cranelift-jit = { version = "0.131.0", optional = true }
+cranelift-object = { version = "0.131.0" }
 target-lexicon = "0.13"
 gimli = { version = "0.33", default-features = false, features = ["write"] }
-object = { version = "0.38.0", default-features = false, features = ["std", "read_core", "write", "archive", "coff", "elf", "macho", "pe"] }
+object = { version = "0.39.1", default-features = false, features = ["std", "read_core", "write", "archive", "coff", "elf", "macho", "pe"] }
 
 indexmap = "2.0.0"
 libloading = { version = "0.9.0", optional = true }
 smallvec = "1.8.1"
 
 [patch.crates-io]
 # Uncomment to use an unreleased version of cranelift
-#cranelift-codegen = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-43.0.0" }
-#cranelift-frontend = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-43.0.0" }
-#cranelift-module = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-43.0.0" }
-#cranelift-native = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-43.0.0" }
-#cranelift-jit = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-43.0.0" }
-#cranelift-object = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-43.0.0" }
+#cranelift-codegen = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-44.0.0" }
+#cranelift-frontend = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-44.0.0" }
+#cranelift-module = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-44.0.0" }
+#cranelift-native = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-44.0.0" }
+#cranelift-jit = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-44.0.0" }
+#cranelift-object = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-44.0.0" }
 
 # Uncomment to use local checkout of cranelift
 #cranelift-codegen = { path = "../wasmtime/cranelift/codegen" }

Cargo.toml

@@ -178,9 +178,7 @@ fn build_llvm_sysroot_for_triple(compiler: Compiler) -> SysrootTarget {
             && !file_name_str.contains("rustc_std_workspace_")
             && !file_name_str.contains("rustc_demangle")
             && !file_name_str.contains("rustc_literal_escaper"))
-            || file_name_str.contains("chalk")
-            || file_name_str.contains("tracing")
-            || file_name_str.contains("regex")
+            || file_name_str.contains("LLVM")
         {
             // These are large crates that are part of the rustc-dev component and are not
             // necessary to run regular programs.
@@ -208,9 +206,9 @@ fn build_clif_sysroot_for_triple(
 
         apply_patches(dirs, "stdlib", &sysroot_src_orig, &STDLIB_SRC.to_path(dirs));
 
-        // Cleanup the deps dir, but keep build scripts and the incremental cache for faster
-        // recompilation as they are not affected by changes in cg_clif.
-        ensure_empty_dir(&build_dir.join("deps"));
+        // Cleanup the build dir, but keep the incremental cache for faster
+        // recompilation as it is not affected by changes in cg_clif.
+        ensure_empty_dir(&build_dir.join("build"));
     }
 
     // Build sysroot
@@ -243,6 +241,7 @@ fn build_clif_sysroot_for_triple(
     build_cmd.arg("--features").arg("backtrace panic-unwind");
     build_cmd.arg(format!("-Zroot-dir={}", STDLIB_SRC.to_path(dirs).display()));
     build_cmd.arg("-Zno-embed-metadata");
+    build_cmd.arg("-Zbuild-dir-new-layout");
     build_cmd.env("CARGO_PROFILE_RELEASE_DEBUG", "true");
     build_cmd.env("__CARGO_DEFAULT_LIB_METADATA", "cg_clif");
     if compiler.triple.contains("apple") {
@@ -254,7 +253,13 @@ fn build_clif_sysroot_for_triple(
     }
     spawn_and_wait(build_cmd);
 
-    for entry in fs::read_dir(build_dir.join("deps")).unwrap() {
+    for entry in fs::read_dir(build_dir.join("build"))
+        .unwrap()
+        .flat_map(|entry| entry.unwrap().path().read_dir().unwrap())
+        .map(|entry| entry.unwrap().path().join("out"))
+        .filter(|entry| entry.exists())
+        .flat_map(|entry| entry.read_dir().unwrap())
+    {
         let entry = entry.unwrap();
         if let Some(ext) = entry.path().extension() {
             if ext == "d" || ext == "dSYM" || ext == "clif" {