Working?!

Author: mattico

src/Cargo.lock

@@ -21,7 +21,6 @@
 #![feature(const_fn)]
 #![feature(staged_api)]
 #![feature(libc)]
-#![cfg_attr(any(unix, target_os = "redox"), feature(libc))]
 
 extern crate libc;
 
@@ -104,7 +103,8 @@ pub extern "C" fn __rust_usable_size(size: usize, _align: usize) -> usize {
 
 #[cfg(any(unix, target_os = "redox"))]
 mod imp {
-    use core::cmp;
+    use libc;
+    use core::ptr;
     use MIN_ALIGN;
 
     pub unsafe fn allocate(size: usize, align: usize) -> *mut u8 {

src/liballoc_frame/lib.rs

@@ -771,14 +771,17 @@ impl<'a> CrateLoader<'a> {
         // also bail out as we don't need to implicitly inject one.
         let mut needs_allocator = false;
         let mut found_required_allocator = false;
+        println!("injecting allocator for {}", self.local_crate_name);
         self.cstore.iter_crate_data(|cnum, data| {
             needs_allocator = needs_allocator || data.needs_allocator();
             if data.is_allocator() {
-                info!("{} required by rlib and is an allocator", data.name());
+                println!("{} required by rlib and is an allocator", data.name());
                 self.inject_dependency_if(cnum, "an allocator",
                                           &|data| data.needs_allocator());
-                found_required_allocator = found_required_allocator ||
-                    data.dep_kind.get() == DepKind::Explicit;
+                let explicit_dep = data.dep_kind.get() == DepKind::Explicit;
+                println!("{} {} an explicit dependency", data.name(), 
+                    if explicit_dep {"is"} else {"is not"});
+                found_required_allocator = found_required_allocator || explicit_dep;
             }
         });
         if !needs_allocator || found_required_allocator { return }
@@ -820,14 +823,15 @@ 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 cfg!(rustc_alloc_frame) && (cfg!(stage0) || cfg!(stage1)) {
+        let name = if cfg!(feature = "rustc_alloc_frame") && cfg!(stage0) {
             // 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)
         };
+        println!("Injecting {} for {}", name, self.local_crate_name);
         let dep_kind = DepKind::Implicit;
         let (cnum, data) =
             self.resolve_crate(&None, name, name, None, DUMMY_SP, PathKind::Crate, dep_kind);

src/librustc_metadata/creader.rs

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

src/libstd/Cargo.toml

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

src/rustc/rustc.rs

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