Skip to content

Commit 9e5a7e9

Browse files
committed
Bring back stage0 allocator logic on MSVC
I think there may still be bugs preventing its removal..
1 parent 7a2a8d7 commit 9e5a7e9

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

Diff for: src/libstd/lib.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -322,9 +322,12 @@
322322
// if the user has disabled jemalloc in `./configure`).
323323
// `force_alloc_system` is *only* intended as a workaround for local rebuilds
324324
// with a rustc without jemalloc.
325-
#![cfg_attr(any(stage0, feature = "force_alloc_system"),
325+
// FIXME(#44236) shouldn't need MSVC logic
326+
#![cfg_attr(all(not(target_env = "msvc"),
327+
any(stage0, feature = "force_alloc_system")),
326328
feature(global_allocator))]
327-
#[cfg(any(stage0, feature = "force_alloc_system"))]
329+
#[cfg(all(not(target_env = "msvc"),
330+
any(stage0, feature = "force_alloc_system")))]
328331
#[global_allocator]
329332
static ALLOC: alloc_system::System = alloc_system::System;
330333

Diff for: src/tools/tidy/src/pal.rs

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ const EXCEPTION_PATHS: &'static [&'static str] = &[
6565
"src/rtstartup", // Not sure what to do about this. magic stuff for mingw
6666

6767
// temporary exceptions
68+
"src/libstd/lib.rs", // FIXME(#44217)
6869
"src/libstd/path.rs",
6970
"src/libstd/f32.rs",
7071
"src/libstd/f64.rs",

0 commit comments

Comments
 (0)