Remove the alloc_jemalloc crate

.gitmodules

@@ -2,9 +2,6 @@
  path = src/llvm
  url = https://github.com/rust-lang/llvm.git
  branch = master
-[submodule "src/jemalloc"]
- path = src/jemalloc
- url = https://github.com/rust-lang/jemalloc.git
 [submodule "src/rust-installer"]
  path = src/tools/rust-installer
  url = https://github.com/rust-lang/rust-installer.git
@@ -64,4 +61,4 @@
  path = src/tools/clang
  url = https://github.com/rust-lang-nursery/clang.git
  branch = rust-release-80-v1
- 
+

.travis.yml

@@ -30,7 +30,7 @@ matrix:
 
  - env: >
  RUST_CHECK_TARGET=dist
- RUST_CONFIGURE_ARGS="--enable-extended --enable-profiler --enable-lldb"
+ RUST_CONFIGURE_ARGS="--enable-extended --enable-profiler --enable-lldb --set rust.jemalloc"
  SRC=.
  DEPLOY_ALT=1
  RUSTC_RETRY_LINKER_ON_SEGFAULT=1
@@ -53,7 +53,7 @@ matrix:
  # version that we're using, 8.2, cannot compile LLVM for OSX 10.7.
  - env: >
  RUST_CHECK_TARGET=check
- RUST_CONFIGURE_ARGS="--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler"
+ RUST_CONFIGURE_ARGS="--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc"
  SRC=.
  RUSTC_RETRY_LINKER_ON_SEGFAULT=1
  MACOSX_DEPLOYMENT_TARGET=10.8
@@ -67,7 +67,7 @@ matrix:
 
  - env: >
  RUST_CHECK_TARGET=check
- RUST_CONFIGURE_ARGS=--build=i686-apple-darwin
+ RUST_CONFIGURE_ARGS="--build=i686-apple-darwin --set rust.jemalloc"
  SRC=.
  RUSTC_RETRY_LINKER_ON_SEGFAULT=1
  MACOSX_DEPLOYMENT_TARGET=10.8
@@ -87,7 +87,7 @@ matrix:
  # OSX 10.7 and `xcode7` is the latest Xcode able to compile LLVM for 10.7.
  - env: >
  RUST_CHECK_TARGET=dist
- RUST_CONFIGURE_ARGS="--build=i686-apple-darwin --enable-full-tools --enable-profiler --enable-lldb"
+ RUST_CONFIGURE_ARGS="--build=i686-apple-darwin --enable-full-tools --enable-profiler --enable-lldb --set rust.jemalloc"
  SRC=.
  DEPLOY=1
  RUSTC_RETRY_LINKER_ON_SEGFAULT=1
@@ -102,7 +102,7 @@ matrix:
 
  - env: >
  RUST_CHECK_TARGET=dist
- RUST_CONFIGURE_ARGS="--target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --enable-lldb"
+ RUST_CONFIGURE_ARGS="--target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --enable-lldb --set rust.jemalloc"
  SRC=.
  DEPLOY=1
  RUSTC_RETRY_LINKER_ON_SEGFAULT=1

config.toml.example

@@ -300,12 +300,6 @@
 # Adding debuginfo makes them several times larger.
 #debuginfo-tools = false
 
-# Whether or not jemalloc is built and enabled
-#use-jemalloc = true
-
-# Whether or not jemalloc is built with its debug option set
-#debug-jemalloc = false
-
 # Whether or not `panic!`s generate backtraces (RUST_BACKTRACE)
 #backtrace = true
 
@@ -402,6 +396,10 @@
 # generally only set for releases
 #remap-debuginfo = false
 
+# Link the compiler against `jemalloc`, where on Linux and OSX it should
+# override the default allocator for rustc and LLVM.
+#jemalloc = false
+
 # =============================================================================
 # Options for specific targets
 #
@@ -441,10 +439,6 @@
 # not, you can specify an explicit file name for it.
 #llvm-filecheck = "/path/to/FileCheck"
 
-# Path to the custom jemalloc static library to link into the standard library
-# by default. This is only used if jemalloc is still enabled above
-#jemalloc = "/path/to/jemalloc/libjemalloc_pic.a"
-
 # If this target is for Android, this option will be required to specify where
 # the NDK for the target lives. This is used to find the C compiler to link and
 # build native code.

src/Cargo.lock

@@ -15,17 +15,6 @@ dependencies = [
  "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "alloc_jemalloc"
-version = "0.0.0"
-dependencies = [
- "build_helper 0.1.0",
- "cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "compiler_builtins 0.0.0",
- "core 0.0.0",
- "libc 0.0.0",
-]
-
 [[package]]
 name = "alloc_system"
 version = "0.0.0"
@@ -785,6 +774,11 @@ dependencies = [
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "fs_extra"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "fst"
 version = "0.3.0"
@@ -996,6 +990,16 @@ name = "itoa"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "jemalloc-sys"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "jobserver"
 version = "0.1.11"
@@ -2181,6 +2185,7 @@ dependencies = [
  "arena 0.0.0",
  "env_logger 0.5.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "graphviz 0.0.0",
+ "jemalloc-sys 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc 0.0.0",
  "rustc-rayon 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2680,7 +2685,6 @@ name = "std"
 version = "0.0.0"
 dependencies = [
  "alloc 0.0.0",
- "alloc_jemalloc 0.0.0",
  "alloc_system 0.0.0",
  "build_helper 0.1.0",
  "cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3237,6 +3241,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
 "checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 "checksum fs2 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
+"checksum fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674"
 "checksum fst 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d94485a00b1827b861dd9d1a2cc9764f9044d4c535514c0760a5a2012ef3399f"
 "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
 "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
@@ -3259,6 +3264,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum is-match 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7e5b386aef33a1c677be65237cb9d32c3f3ef56bd035949710c4bb13083eb053"
 "checksum itertools 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)" = "f58856976b776fedd95533137617a02fb25719f40e7d9b01c7043cd65474f450"
 "checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
+"checksum jemalloc-sys 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "bfc62c8e50e381768ce8ee0428ee53741929f7ebd73e4d83f669bcf7693e00ae"
 "checksum jobserver 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "60af5f849e1981434e4a31d3d782c4774ae9b434ce55b101a96ecfd09147e8be"
 "checksum json 0.11.13 (registry+https://github.com/rust-lang/crates.io-index)" = "9ad0485404155f45cce53a40d4b2d6ac356418300daed05273d9e26f91c390be"
 "checksum jsonrpc-core 8.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ddf83704f4e79979a424d1082dd2c1e52683058056c9280efa19ac5f6bc9033c"

src/bootstrap/bootstrap.py

@@ -715,11 +715,6 @@ def update_submodules(self):
  backends = self.get_toml('codegen-backends')
  if backends is None or not 'emscripten' in backends:
  continue
- if module.endswith("jemalloc"):
- if self.get_toml('use-jemalloc') == 'false':
- continue
- if self.get_toml('jemalloc'):
- continue
  if module.endswith("lld"):
  config = self.get_toml('lld')
  if config is None or config == 'false':

src/bootstrap/compile.rs

@@ -158,16 +158,7 @@ pub fn std_cargo(builder: &Builder,
  .arg("--manifest-path")
  .arg(builder.src.join("src/rustc/compiler_builtins_shim/Cargo.toml"));
  } else {
- let mut features = builder.std_features();
-
- // When doing a local rebuild we tell cargo that we're stage1 rather than
- // stage0. This works fine if the local rust and being-built rust have the
- // same view of what the default allocator is, but fails otherwise. Since
- // we don't have a way to express an allocator preference yet, work
- // around the issue in the case of a local rebuild with jemalloc disabled.
- if compiler.stage == 0 && builder.local_rebuild && !builder.config.use_jemalloc {
- features.push_str(" force_alloc_system");
- }
+ let features = builder.std_features();
 
  if compiler.stage != 0 && builder.config.sanitizers {
  // This variable is used by the sanitizer runtime crates, e.g.
@@ -188,11 +179,6 @@ pub fn std_cargo(builder: &Builder,
  .arg("--manifest-path")
  .arg(builder.src.join("src/libstd/Cargo.toml"));
 
- if let Some(target) = builder.config.target_config.get(&target) {
- if let Some(ref jemalloc) = target.jemalloc {
- cargo.env("JEMALLOC_OVERRIDE", jemalloc);
- }
- }
  if target.contains("musl") {
  if let Some(p) = builder.musl_root(target) {
  cargo.env("MUSL_ROOT", p);

src/bootstrap/config.rs

@@ -116,15 +116,14 @@ pub struct Config {
  pub hosts: Vec<Interned<String>>,
  pub targets: Vec<Interned<String>>,
  pub local_rebuild: bool,
+ pub jemalloc: bool,
 
  // dist misc
  pub dist_sign_folder: Option<PathBuf>,
  pub dist_upload_addr: Option<String>,
  pub dist_gpg_password_file: Option<PathBuf>,
 
  // libstd features
- pub debug_jemalloc: bool,
- pub use_jemalloc: bool,
  pub backtrace: bool, // support for RUST_BACKTRACE
  pub wasm_syscall: bool,
 
@@ -166,7 +165,6 @@ pub struct Target {
  pub llvm_config: Option<PathBuf>,
  /// Some(path to FileCheck) if one was specified.
  pub llvm_filecheck: Option<PathBuf>,
- pub jemalloc: Option<PathBuf>,
  pub cc: Option<PathBuf>,
  pub cxx: Option<PathBuf>,
  pub ar: Option<PathBuf>,
@@ -263,7 +261,7 @@ struct Llvm {
  link_jobs: Option<u32>,
  link_shared: Option<bool>,
  version_suffix: Option<String>,
- clang_cl: Option<String>
+ clang_cl: Option<String>,
 }
 
 #[derive(Deserialize, Default, Clone)]
@@ -302,8 +300,6 @@ struct Rust {
  debuginfo_only_std: Option<bool>,
  debuginfo_tools: Option<bool>,
  experimental_parallel_queries: Option<bool>,
- debug_jemalloc: Option<bool>,
- use_jemalloc: Option<bool>,
  backtrace: Option<bool>,
  default_linker: Option<String>,
  channel: Option<String>,
@@ -329,6 +325,7 @@ struct Rust {
  backtrace_on_ice: Option<bool>,
  verify_llvm_ir: Option<bool>,
  remap_debuginfo: Option<bool>,
+ jemalloc: Option<bool>,
 }
 
 /// TOML representation of how each build target is configured.
@@ -337,7 +334,6 @@ struct Rust {
 struct TomlTarget {
  llvm_config: Option<String>,
  llvm_filecheck: Option<String>,
- jemalloc: Option<String>,
  cc: Option<String>,
  cxx: Option<String>,
  ar: Option<String>,
@@ -363,7 +359,6 @@ impl Config {
  config.llvm_enabled = true;
  config.llvm_optimize = true;
  config.llvm_version_check = true;
- config.use_jemalloc = true;
  config.backtrace = true;
  config.rust_optimize = true;
  config.rust_optimize_tests = true;
@@ -499,7 +494,6 @@ impl Config {
  let mut debuginfo_only_std = None;
  let mut debuginfo_tools = None;
  let mut debug = None;
- let mut debug_jemalloc = None;
  let mut debuginfo = None;
  let mut debug_assertions = None;
  let mut optimize = None;
@@ -541,12 +535,11 @@ impl Config {
  debuginfo_tools = rust.debuginfo_tools;
  optimize = rust.optimize;
  ignore_git = rust.ignore_git;
- debug_jemalloc = rust.debug_jemalloc;
  set(&mut config.rust_optimize_tests, rust.optimize_tests);
  set(&mut config.rust_debuginfo_tests, rust.debuginfo_tests);
  set(&mut config.codegen_tests, rust.codegen_tests);
  set(&mut config.rust_rpath, rust.rpath);
- set(&mut config.use_jemalloc, rust.use_jemalloc);
+ set(&mut config.jemalloc, rust.jemalloc);
  set(&mut config.backtrace, rust.backtrace);
  set(&mut config.channel, rust.channel.clone());
  set(&mut config.rust_dist_src, rust.dist_src);
@@ -596,9 +589,6 @@ impl Config {
  if let Some(ref s) = cfg.llvm_filecheck {
  target.llvm_filecheck = Some(config.src.join(s));
  }
- if let Some(ref s) = cfg.jemalloc {
- target.jemalloc = Some(config.src.join(s));
- }
  if let Some(ref s) = cfg.android_ndk {
  target.ndk = Some(config.src.join(s));
  }
@@ -644,7 +634,6 @@ impl Config {
  config.rust_debuginfo_tools = debuginfo_tools.unwrap_or(false);
 
  let default = debug == Some(true);
- config.debug_jemalloc = debug_jemalloc.unwrap_or(default);
  config.rust_debuginfo = debuginfo.unwrap_or(default);
  config.rust_debug_assertions = debug_assertions.unwrap_or(default);
 

src/bootstrap/configure.py

@@ -82,7 +82,6 @@ def v(*args):
 o("debuginfo-lines", "rust.debuginfo-lines", "build with line number debugger metadata")
 o("debuginfo-only-std", "rust.debuginfo-only-std", "build only libstd with debugging information")
 o("debuginfo-tools", "rust.debuginfo-tools", "build extended tools with debugging information")
-o("debug-jemalloc", "rust.debug-jemalloc", "build jemalloc with --enable-debug --enable-fill")
 v("save-toolstates", "rust.save-toolstates", "save build and test status of external tools into this file")
 
 v("prefix", "install.prefix", "set installation prefix")
@@ -99,7 +98,6 @@ def v(*args):
 v("llvm-config", None, "set path to llvm-config")
 v("llvm-filecheck", None, "set path to LLVM's FileCheck utility")
 v("python", "build.python", "set path to python")
-v("jemalloc-root", None, "set directory where libjemalloc_pic.a is located")
 v("android-cross-path", "target.arm-linux-androideabi.android-ndk",
  "Android NDK standalone path (deprecated)")
 v("i686-linux-android-ndk", "target.i686-linux-android.android-ndk",
@@ -148,7 +146,6 @@ def v(*args):
 # Many of these are saved below during the "writing configuration" step
 # (others are conditionally saved).
 o("manage-submodules", "build.submodules", "let the build manage the git submodules")
-o("jemalloc", "rust.use-jemalloc", "build liballoc with jemalloc")
 o("full-bootstrap", "build.full-bootstrap", "build three compilers instead of two")
 o("extended", "build.extended", "build an extended rust tool set")
 
@@ -330,8 +327,6 @@ def set(key, value):
  set('target.{}.llvm-config'.format(build()), value)
  elif option.name == 'llvm-filecheck':
  set('target.{}.llvm-filecheck'.format(build()), value)
- elif option.name == 'jemalloc-root':
- set('target.{}.jemalloc'.format(build()), value + '/libjemalloc_pic.a')
  elif option.name == 'tools':
  set('build.tools', value.split(','))
  elif option.name == 'host':

src/bootstrap/dist.rs

@@ -859,7 +859,6 @@ impl Step for Src {
  "src/build_helper",
  "src/dlmalloc",
  "src/liballoc",
- "src/liballoc_jemalloc",
  "src/liballoc_system",
  "src/libbacktrace",
  "src/libcompiler_builtins",
@@ -878,14 +877,12 @@ impl Step for Src {
  "src/rustc/dlmalloc_shim",
  "src/libtest",
  "src/libterm",
- "src/jemalloc",
  "src/libprofiler_builtins",
  "src/stdsimd",
  "src/libproc_macro",
  ];
  let std_src_dirs_exclude = [
  "src/libcompiler_builtins/compiler-rt/test",
- "src/jemalloc/test/unit",
  ];
 
  copy_src_dirs(builder, &std_src_dirs[..], &std_src_dirs_exclude[..], &dst_src);