From c4b98c4427fb4c12663bcd7d76e4c7c5a290b98e Mon Sep 17 00:00:00 2001 From: Daniel Paoliello Date: Wed, 3 Sep 2025 17:02:52 -0700 Subject: [PATCH 1/2] Update cc-rs to 1.2.33 --- Cargo.lock | 7 +++---- compiler/rustc_llvm/Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3d4a1bf6a7880..28f7429a21ef2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -462,9 +462,9 @@ version = "0.1.0" [[package]] name = "cc" -version = "1.2.16" +version = "1.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c" +checksum = "3ee0f8803222ba5a7e2777dd72ca451868909b1ac410621b676adf07280e9b5f" dependencies = [ "jobserver", "libc", @@ -5504,8 +5504,7 @@ version = "0.1.0" [[package]] name = "tikv-jemalloc-sys" version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3c60906412afa9c2b5b5a48ca6a5abe5736aec9eb48ad05037a677e52e4e2d" +source = "git+https://github.com/dpaoliello/jemallocator.git?branch=temp#329682034ae0b8f7cca4514146b211d7dc694c9c" dependencies = [ "cc", "libc", diff --git a/compiler/rustc_llvm/Cargo.toml b/compiler/rustc_llvm/Cargo.toml index ad93c74538130..45011f9b446cb 100644 --- a/compiler/rustc_llvm/Cargo.toml +++ b/compiler/rustc_llvm/Cargo.toml @@ -11,7 +11,7 @@ libc = "0.2.73" [build-dependencies] # tidy-alphabetical-start # `cc` updates often break things, so we pin it here. -cc = "=1.2.16" +cc = "=1.2.33" # tidy-alphabetical-end [features] From ea1101f2db15b1a9a3ee95ac8daae8d4750eba3c Mon Sep 17 00:00:00 2001 From: Daniel Paoliello Date: Tue, 23 Sep 2025 15:12:47 -0700 Subject: [PATCH 2/2] Test jemalloc fix --- Cargo.lock | 2 +- Cargo.toml | 4 ++-- src/tools/tidy/src/extdeps.rs | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 28f7429a21ef2..991a51cb9f19e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5504,7 +5504,7 @@ version = "0.1.0" [[package]] name = "tikv-jemalloc-sys" version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7" -source = "git+https://github.com/dpaoliello/jemallocator.git?branch=temp#329682034ae0b8f7cca4514146b211d7dc694c9c" +source = "git+https://github.com/dpaoliello/jemallocator.git?branch=filterlto#6db31514fd2241445a4b5f350ef0f9a214d69793" dependencies = [ "cc", "libc", diff --git a/Cargo.toml b/Cargo.toml index 67c7a9d67edc8..ff23c351082ac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -91,5 +91,5 @@ codegen-units = 1 # If you want to use a crate with local modifications, you can set a path or git dependency here. # For git dependencies, also add your source to ALLOWED_SOURCES in src/tools/tidy/src/extdeps.rs. -#[patch.crates-io] - +[patch.crates-io] +tikv-jemalloc-sys = { git = 'https://github.com/dpaoliello/jemallocator.git', branch = 'filterlto' } diff --git a/src/tools/tidy/src/extdeps.rs b/src/tools/tidy/src/extdeps.rs index f75de13b45ceb..99df1dd8b795c 100644 --- a/src/tools/tidy/src/extdeps.rs +++ b/src/tools/tidy/src/extdeps.rs @@ -11,6 +11,7 @@ const ALLOWED_SOURCES: &[&str] = &[ r#""registry+https://github.com/rust-lang/crates.io-index""#, // This is `rust_team_data` used by `site` in src/tools/rustc-perf, r#""git+https://github.com/rust-lang/team#a5260e76d3aa894c64c56e6ddc8545b9a98043ec""#, + r#""git+https://github.com/dpaoliello/jemallocator.git?branch=filterlto#6db31514fd2241445a4b5f350ef0f9a214d69793""#, ]; /// Checks for external package sources. `root` is the path to the directory that contains the