Skip to content

Commit ab2457e

Browse files
Auto merge of #112049 - Kobzol:pgo-omit-benchmarks, r=<try>
[do not merge] CI experiments Various CI experiments for try/dist builds. r? `@ghost`
2 parents 2b0274c + 0957323 commit ab2457e

File tree

3 files changed

+1
-42
lines changed

3 files changed

+1
-42
lines changed

compiler/rustc/src/main.rs

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -39,40 +39,5 @@
3939

4040
fn main() {
4141
// See the comment at the top of this file for an explanation of this.
42-
#[cfg(feature = "jemalloc")]
43-
{
44-
use std::os::raw::{c_int, c_void};
45-
46-
use tikv_jemalloc_sys as jemalloc_sys;
47-
48-
#[used]
49-
static _F1: unsafe extern "C" fn(usize, usize) -> *mut c_void = jemalloc_sys::calloc;
50-
#[used]
51-
static _F2: unsafe extern "C" fn(*mut *mut c_void, usize, usize) -> c_int =
52-
jemalloc_sys::posix_memalign;
53-
#[used]
54-
static _F3: unsafe extern "C" fn(usize, usize) -> *mut c_void = jemalloc_sys::aligned_alloc;
55-
#[used]
56-
static _F4: unsafe extern "C" fn(usize) -> *mut c_void = jemalloc_sys::malloc;
57-
#[used]
58-
static _F5: unsafe extern "C" fn(*mut c_void, usize) -> *mut c_void = jemalloc_sys::realloc;
59-
#[used]
60-
static _F6: unsafe extern "C" fn(*mut c_void) = jemalloc_sys::free;
61-
62-
// On OSX, jemalloc doesn't directly override malloc/free, but instead
63-
// registers itself with the allocator's zone APIs in a ctor. However,
64-
// the linker doesn't seem to consider ctors as "used" when statically
65-
// linking, so we need to explicitly depend on the function.
66-
#[cfg(target_os = "macos")]
67-
{
68-
unsafe extern "C" {
69-
fn _rjem_je_zone_register();
70-
}
71-
72-
#[used]
73-
static _F7: unsafe extern "C" fn() = _rjem_je_zone_register;
74-
}
75-
}
76-
7742
rustc_driver::main()
7843
}

src/bootstrap/src/core/build_steps/tool.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -731,10 +731,7 @@ impl Step for Rustdoc {
731731
// libraries here. The intuition here is that If we've built a compiler, we should be able
732732
// to build rustdoc.
733733
//
734-
let mut extra_features = Vec::new();
735-
if builder.config.jemalloc(target) {
736-
extra_features.push("jemalloc".to_string());
737-
}
734+
let extra_features = Vec::new();
738735

739736
let ToolBuildResult { tool_path, build_compiler, target_compiler } =
740737
builder.ensure(ToolBuild {

src/bootstrap/src/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -758,9 +758,6 @@ impl Build {
758758
crates.is_empty() || possible_features_by_crates.contains(feature)
759759
};
760760
let mut features = vec![];
761-
if self.config.jemalloc(target) && check("jemalloc") {
762-
features.push("jemalloc");
763-
}
764761
if (self.config.llvm_enabled(target) || kind == Kind::Check) && check("llvm") {
765762
features.push("llvm");
766763
}

0 commit comments

Comments
 (0)