diff options
| author | bors <bors@rust-lang.org> | 2021-04-05 21:14:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-04-05 21:14:27 +0000 |
| commit | d32238532138485c80db4f2cd596372bce214e00 (patch) | |
| tree | 1bd4c49de1e3d611abbc1f95909013a5b674c4ba /src/bootstrap | |
| parent | d203fceeb12f8c0e3123fc45036575018d2f990a (diff) | |
| parent | 3965773ae7743e051070b4eed3c6e02e9df3b25c (diff) | |
| download | rust-d32238532138485c80db4f2cd596372bce214e00.tar.gz rust-d32238532138485c80db4f2cd596372bce214e00.zip | |
Auto merge of #83152 - guswynn:jemallocator_part2, r=Mark-Simulacrum
Use tikv-jemallocator in rustc/rustdoc in addition to jemalloc-sys when enabled. In https://github.com/rust-lang/rust/pull/81782 it was mentioned that one reason rustc may benefit from minimalloc is it doesn't use the `sdallocx` api from jemalloc. Currently, on unix, rust uses jemalloc by importing its symbols to use them with the default, System (libc) global allocator. This PR switches its global alloc to `tikv-jemallocator`, which correctly uses sized deallocation (https://docs.rs/tikv-jemallocator/0.4.1/src/tikv_jemallocator/lib.rs.html#121-126). `tikv-jemallocator`, as far as I can tell, is a more up-to-date set of bindings to jemalloc than `jemallocator` The perf results of this pr are in large part due to the version upgrade of jemalloc, but sized deallocation has a non-trivial improvement, particularly to rustdoc. This pr also includes changes to bootstrap to correctly pass the jemalloc feature through to the rustdoc build
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/tool.rs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs index f9be35d7c5e..e85f4628fb0 100644 --- a/src/bootstrap/tool.rs +++ b/src/bootstrap/tool.rs @@ -532,6 +532,11 @@ impl Step for Rustdoc { // they'll be linked to those libraries). As such, don't explicitly `ensure` any additional // libraries here. The intuition here is that If we've built a compiler, we should be able // to build rustdoc. + // + let mut features = Vec::new(); + if builder.config.jemalloc { + features.push("jemalloc".to_string()); + } let cargo = prepare_tool_cargo( builder, @@ -541,7 +546,7 @@ impl Step for Rustdoc { "build", "src/tools/rustdoc", SourceType::InTree, - &[], + features.as_slice(), ); builder.info(&format!( |
