Use mimalloc as the global allocator on x86_64-pc-windows-msvc

Author: Zoxc

Cargo.lock

@@ -756,7 +756,7 @@ checksum = "af491d569909a7e4dee0ad7db7f5341fef5c614d5b8ec8cf765732aba3cff681"
 dependencies = [
  "serde",
  "termcolor",
- "unicode-width 0.1.14",
+ "unicode-width 0.2.2",
 ]
 
 [[package]]
@@ -2216,6 +2216,15 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
 
+[[package]]
+name = "libmimalloc-sys"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc89deee4af0429081d2a518c0431ae068222a5a262a3bc6ff4d8535ec2e02fe"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "libredox"
 version = "0.1.10"
@@ -2399,6 +2408,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "mimalloc"
+version = "0.1.49"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aca3c01a711f395b4257b81674c0e90e8dd1f1e62c4b7db45f684cc7a4fcb18a"
+dependencies = [
+ "libmimalloc-sys",
+]
+
 [[package]]
 name = "minifier"
 version = "0.3.6"
@@ -3808,6 +3826,7 @@ dependencies = [
  "ctrlc",
  "jiff",
  "libc",
+ "mimalloc",
  "rustc_abi",
  "rustc_ast",
  "rustc_ast_pretty",

compiler/rustc/Cargo.toml

@@ -26,8 +26,7 @@ rustc_public_bridge = { path = "../rustc_public_bridge" }
 getrandom = "=0.3.3"
 wasi = "=0.14.2"
 
-
-[dependencies.tikv-jemalloc-sys]
+[target.'cfg(not(target_os = "windows"))'.dependencies.tikv-jemalloc-sys]
 version = "0.6.1"
 optional = true
 features = ['override_allocator_on_supported_platforms']
@@ -39,7 +38,7 @@ llvm = ['rustc_driver_impl/llvm']
 llvm_enzyme = ['rustc_driver_impl/llvm_enzyme']
 llvm_offload = ['rustc_driver_impl/llvm_offload']
 max_level_info = ['rustc_driver_impl/max_level_info']
-override_allocator = ['dep:tikv-jemalloc-sys']
+override_allocator = ['dep:tikv-jemalloc-sys', 'rustc_driver_impl/override_allocator']
 rustc_randomized_layouts = ['rustc_driver_impl/rustc_randomized_layouts']
 # tidy-alphabetical-end
 

compiler/rustc/src/main.rs

@@ -37,7 +37,7 @@ use std::process::ExitCode;
 // to compare their performance, see
 // https://github.com/rust-lang/rust/commit/b90cfc887c31c3e7a9e6d462e2464db1fe506175#diff-43914724af6e464c1da2171e4a9b6c7e607d5bc1203fa95c0ab85be4122605ef
 // for an example of how to do so.
-#[cfg(feature = "override_allocator")]
+#[cfg(all(feature = "override_allocator", not(target_os = "windows")))]
 use tikv_jemalloc_sys as _;
 
 fn main() -> ExitCode {

compiler/rustc_driver_impl/Cargo.toml

@@ -55,13 +55,18 @@ features = [
 ctrlc = "3.4.4"
 # tidy-alphabetical-end
 
+[target.'cfg(target_os = "windows")'.dependencies.mimalloc]
+version = "0.1.49"
+optional = true
+
 [features]
 # tidy-alphabetical-start
 check_only = ['rustc_interface/check_only']
 llvm = ['rustc_interface/llvm']
 llvm_enzyme = ['rustc_interface/llvm_enzyme']
 llvm_offload = ['rustc_interface/llvm_offload']
 max_level_info = ['rustc_log/max_level_info']
+override_allocator = ['dep:mimalloc']
 rustc_randomized_layouts = [
     'rustc_index/rustc_randomized_layouts',
     'rustc_middle/rustc_randomized_layouts'

compiler/rustc_driver_impl/src/lib.rs

@@ -63,6 +63,10 @@ use rustc_target::json::ToJson;
 use rustc_target::spec::{Target, TargetTuple};
 use tracing::trace;
 
+#[cfg(all(feature = "override_allocator", target_os = "windows"))]
+#[global_allocator]
+static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
+
 #[allow(unused_macros)]
 macro do_not_use_print($($t:tt)*) {
     std::compile_error!(

src/ci/github-actions/jobs.yml

@@ -659,6 +659,7 @@ auto:
         --target=x86_64-pc-windows-msvc
         --enable-full-tools
         --enable-profiler
+        --set rust.override-allocator
         --set rust.codegen-units=1
       SCRIPT: python x.py build --set rust.debug=true opt-dist && PGO_HOST=x86_64-pc-windows-msvc ./build/x86_64-pc-windows-msvc/stage1-tools-bin/opt-dist windows-ci -- python x.py dist bootstrap --include-default-paths
       DIST_REQUIRE_ALL_TOOLS: 1

src/librustdoc/lib.rs

@@ -62,7 +62,7 @@ extern crate test;
 /// FIXME(madsmtm): This is loaded from the sysroot that was built with the other `rustc` crates
 /// above, instead of via Cargo as you'd normally do. This is currently needed for LTO due to
 /// https://github.com/rust-lang/cc-rs/issues/1613.
-#[cfg(feature = "override_allocator")]
+#[cfg(all(feature = "override_allocator", not(target_os = "windows")))]
 extern crate tikv_jemalloc_sys as _;
 
 use std::env::{self, VarError};

src/tools/clippy/src/driver.rs

@@ -17,7 +17,7 @@ extern crate rustc_span;
 /// FIXME(madsmtm): This is loaded from the sysroot that was built with the other `rustc` crates
 /// above, instead of via Cargo as you'd normally do. This is currently needed for LTO due to
 /// <https://github.com/rust-lang/cc-rs/issues/1613>.
-#[cfg(feature = "override_allocator")]
+#[cfg(all(feature = "override_allocator", not(target_os = "windows")))]
 extern crate tikv_jemalloc_sys as _;
 
 use clippy_utils::sym;

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

@@ -24,7 +24,7 @@ extern crate rustc_span;
 /// FIXME(madsmtm): This is loaded from the sysroot that was built with the other `rustc` crates
 /// above, instead of via Cargo as you'd normally do. This is currently needed for LTO due to
 /// https://github.com/rust-lang/cc-rs/issues/1613.
-#[cfg(feature = "override_allocator")]
+#[cfg(all(feature = "override_allocator", not(target_os = "windows")))]
 // Make sure `--all-features` works: only Linux and macOS actually use jemalloc, and not on arm32.
 #[cfg(all(
     any(target_os = "linux", target_os = "macos"),

src/tools/tidy/src/deps.rs

@@ -356,6 +356,7 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
     "leb128",
     "libc",
     "libloading",
+    "libmimalloc-sys",
     "linux-raw-sys",
     "litemap",
     "lock_api",
@@ -365,6 +366,7 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
     "measureme",
     "memchr",
     "memmap2",
+    "mimalloc",
     "miniz_oxide",
     "nix",
     "nu-ansi-term",