Hack to enable alloc_frame for stage1+ rustc

Author: mattico

configure

@@ -637,7 +637,7 @@ opt codegen-tests 1 "run the src/test/codegen tests"
 opt option-checking 1 "complain about unrecognized options in this configure script"
 opt ninja 0 "build LLVM using the Ninja generator (for MSVC, requires building in the correct environment)"
 opt vendor 0 "enable usage of vendored Rust crates"
-opt frame-alloc 0 "enable the frame allocator"
+opt rustc-alloc-frame 0 "enable the frame allocator in rustc"
 
 # Optimization and debugging options. These may be overridden by the release channel, etc.
 opt_nosave optimize 1 "build optimized rust code"
@@ -1065,6 +1065,12 @@ else
     CFG_USING_LIBCPP="0"
 fi
 
+# Disable jemalloc if using alloc frame.
+if [ -n "$CFG_ENABLE_RUSTC_ALLOC_FRAME" ]
+then
+    CFG_DISABLE_JEMALLOC=1
+fi
+
 # Same with jemalloc.  save the setting here.
 if [ -n "$CFG_DISABLE_JEMALLOC" ]
 then

src/Cargo.lock

@@ -77,10 +77,10 @@ pub struct Config {
     // libstd features
     pub debug_jemalloc: bool,
     pub use_jemalloc: bool,
-    pub use_alloc_frame: bool,
     pub backtrace: bool, // support for RUST_BACKTRACE
 
     // misc
+    pub rustc_alloc_frame: bool,
     pub channel: String,
     pub quiet_tests: bool,
     // Fallback musl-root for all targets
@@ -177,7 +177,7 @@ struct Rust {
     debuginfo_lines: Option<bool>,
     debug_jemalloc: Option<bool>,
     use_jemalloc: Option<bool>,
-    use_alloc_frame: Option<bool>,
+    rustc_alloc_frame: Option<bool>,
     backtrace: Option<bool>,
     default_linker: Option<String>,
     default_ar: Option<String>,
@@ -205,7 +205,7 @@ impl Config {
         let mut config = Config::default();
         config.llvm_optimize = true;
         config.use_jemalloc = true;
-        config.use_alloc_frame = false;
+        config.rustc_alloc_frame = false;
         config.backtrace = true;
         config.rust_optimize = true;
         config.rust_optimize_tests = true;
@@ -301,9 +301,9 @@ impl Config {
             set(&mut config.rust_rpath, rust.rpath);
             set(&mut config.debug_jemalloc, rust.debug_jemalloc);
             set(&mut config.use_jemalloc, rust.use_jemalloc);
-            set(&mut config.use_alloc_frame, rust.use_alloc_frame);
             set(&mut config.backtrace, rust.backtrace);
             set(&mut config.channel, rust.channel.clone());
+            set(&mut config.rustc_alloc_frame, rust.rustc_alloc_frame);
             config.rustc_default_linker = rust.default_linker.clone();
             config.rustc_default_ar = rust.default_ar.clone();
             config.musl_root = rust.musl_root.clone().map(PathBuf::from);
@@ -389,7 +389,7 @@ impl Config {
                 ("DEBUGINFO_LINES", self.rust_debuginfo_lines),
                 ("JEMALLOC", self.use_jemalloc),
                 ("DEBUG_JEMALLOC", self.debug_jemalloc),
-                ("FRAME_ALLOC", self.use_alloc_frame),
+                ("RUSTC_ALLOC_FRAME", self.rustc_alloc_frame),
                 ("RPATH", self.rust_rpath),
                 ("OPTIMIZE_TESTS", self.rust_optimize_tests),
                 ("DEBUGINFO_TESTS", self.rust_debuginfo_tests),

src/bootstrap/config.rs

@@ -137,9 +137,12 @@
 # Whether or not jemalloc is built with its debug option set
 #debug-jemalloc = false
 
-# Whether or not the frame allocator is built and enabled
+# Whether or not the frame allocator is built and enabled in std
 #use-alloc-frame = false
 
+# Whether or not the frame allocator is built and enabled in rustc
+#rustc-use-alloc-frame = false
+
 # Whether or not `panic!`s generate backtraces (RUST_BACKTRACE)
 #backtrace = true
 

src/bootstrap/config.toml.example

@@ -609,9 +609,6 @@ impl Build {
         if self.config.use_jemalloc {
             features.push_str(" jemalloc");
         }
-        if self.config.use_alloc_frame {
-            features.push_str(" alloc_frame");
-        }
         if self.config.backtrace {
             features.push_str(" backtrace");
         }
@@ -624,8 +621,8 @@ impl Build {
         if self.config.use_jemalloc {
             features.push_str(" jemalloc");
         }
-        if self.config.use_alloc_frame {
-            features.push_str(" alloc_frame");
+        if self.config.rustc_alloc_frame {
+            features.push_str(" rustc_alloc_frame");
         }
         return features
     }

src/bootstrap/lib.rs

@@ -36,3 +36,6 @@ serialize = { path = "../libserialize" }
 syntax = { path = "../libsyntax" }
 syntax_ext = { path = "../libsyntax_ext" }
 syntax_pos = { path = "../libsyntax_pos" }
+
+[features]
+rustc_alloc_frame = ["rustc_metadata/rustc_alloc_frame"]

src/librustc_driver/Cargo.toml

@@ -22,3 +22,6 @@ serialize = { path = "../libserialize" }
 syntax = { path = "../libsyntax" }
 syntax_ext = { path = "../libsyntax_ext" }
 syntax_pos = { path = "../libsyntax_pos" }
+
+[features]
+rustc_alloc_frame = []

src/librustc_metadata/Cargo.toml

@@ -820,7 +820,10 @@ impl<'a> CrateLoader<'a> {
         // * Binaries use jemalloc
         // * Staticlibs and Rust dylibs use system malloc
         // * Rust dylibs used as dependencies to rust use jemalloc
-        let name = if need_lib_alloc && !self.sess.opts.cg.prefer_dynamic {
+        let name = if cfg!(rustc_alloc_frame) && (cfg!(stage0) || cfg!(stage1)) {
+            // HACK to make stage1/2 with alloc_frame
+            Symbol::intern(&"alloc_frame")
+        } else if need_lib_alloc && !self.sess.opts.cg.prefer_dynamic {
             Symbol::intern(&self.sess.target.target.options.lib_allocation_crate)
         } else {
             Symbol::intern(&self.sess.target.target.options.exe_allocation_crate)

src/librustc_metadata/creader.rs

@@ -30,3 +30,6 @@ log = { path = "../liblog" }
 [build-dependencies]
 build_helper = { path = "../build_helper" }
 gcc = "0.3.27"
+
+[features]
+rustc_alloc_frame = ["rustc_driver/rustc_alloc_frame", "rustc_metadata/rustc_alloc_frame"]

src/librustdoc/Cargo.toml

@@ -13,7 +13,6 @@ crate-type = ["dylib", "rlib"]
 alloc = { path = "../liballoc" }
 alloc_jemalloc = { path = "../liballoc_jemalloc", optional = true }
 alloc_system = { path = "../liballoc_system" }
-alloc_frame = { path = "../liballoc_frame", optional = true }
 panic_unwind = { path = "../libpanic_unwind", optional = true }
 panic_abort = { path = "../libpanic_abort" }
 collections = { path = "../libcollections" }

src/libstd/Cargo.toml

@@ -331,7 +331,7 @@ extern crate libc;
 // We always need an unwinder currently for backtraces
 extern crate unwind;
 
-#[cfg(all(stage0, not(alloc_frame)))]
+#[cfg(stage0)]
 extern crate alloc_system;
 
 // compiler-rt intrinsics

src/libstd/lib.rs

@@ -21,3 +21,4 @@ alloc_frame = { path = "../liballoc_frame", optional = true }
 
 [features]
 jemalloc = ["rustc_back/jemalloc"]
+rustc_alloc_frame = ["alloc_frame", "rustc_driver/rustc_alloc_frame"]

src/rustc/Cargo.toml

@@ -9,12 +9,13 @@
 // except according to those terms.
 
 #![feature(rustc_private)]
-#![cfg_attr(feature = "alloc_frame", feature(alloc_frame))]
+#![feature(staged_api)]
+#![cfg_attr(all(feature = "rustc_alloc_frame", not(stage0)), feature(alloc_frame))]
 
 extern crate rustc_driver;
 
 // Use the frame allocator to speed up runtime
-#[cfg(feature = "alloc_frame")]
+#[cfg(all(feature = "rustc_alloc_frame", not(stage0)))]
 extern crate alloc_frame;
 
 fn main() { rustc_driver::main() }

src/rustc/rustc.rs

@@ -9,12 +9,13 @@
 // except according to those terms.
 
 #![feature(rustdoc)]
-#![cfg_attr(feature = "alloc_frame", feature(alloc_frame))]
+#![feature(staged_api)]
+#![cfg_attr(all(feature = "rustc_alloc_frame", not(stage0)), feature(alloc_frame))]
 
 extern crate rustdoc;
 
 // Use the frame allocator to speed up runtime
-#[cfg(feature = "alloc_frame")]
+#[cfg(all(feature = "rustc_alloc_frame", not(stage0)))]
 extern crate alloc_frame;
 
 fn main() { rustdoc::main() }

src/rustc/rustdoc.rs

@@ -37,5 +37,4 @@ core = { path = "../../libcore" }
 backtrace = ["std/backtrace"]
 debug-jemalloc = ["std/debug-jemalloc"]
 jemalloc = ["std/jemalloc"]
-alloc_frame = ["std/alloc_frame"]
 panic-unwind = ["std/panic-unwind"]

src/rustc/std_shim/Cargo.toml

@@ -28,6 +28,7 @@
 //! - core may not have platform-specific code
 //! - liballoc_system may have platform-specific code
 //! - liballoc_jemalloc may have platform-specific code
+//! - liballoc_frame may have platform-specific code
 //! - libpanic_abort may have platform-specific code
 //! - libpanic_unwind may have platform-specific code
 //! - libunwind may have platform-specific code