---

yaml
---
r: 120203
b: refs/heads/dist-snap
c: 8b912bc
h: refs/heads/master
i:
  120201: 8dbb1eb
  120199: e010392
v: v3

Author: thestinger

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 1813e5aa1a03b0596b8de7abd1af31edf5d6098f
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: e031ba1028a1705708401a04f5823bcc3e4a439c
+refs/heads/dist-snap: 8b912bc56be35149a405752f134b8b659366a35c
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libarena/lib.rs

@@ -341,29 +341,7 @@ struct TypedArenaChunk<T> {
 }
 
 impl<T> TypedArenaChunk<T> {
-    #[cfg(stage0)]
     #[inline]
-    fn new(next: Option<Box<TypedArenaChunk<T>>>, capacity: uint)
-           -> Box<TypedArenaChunk<T>> {
-        let mut size = mem::size_of::<TypedArenaChunk<T>>();
-        size = round_up(size, min_align_of::<T>());
-        let elem_size = mem::size_of::<T>();
-        let elems_size = elem_size.checked_mul(&capacity).unwrap();
-        size = size.checked_add(&elems_size).unwrap();
-
-        let mut chunk = unsafe {
-            let chunk = exchange_malloc(size);
-            let mut chunk: Box<TypedArenaChunk<T>> = mem::transmute(chunk);
-            mem::move_val_init(&mut chunk.next, next);
-            chunk
-        };
-
-        chunk.capacity = capacity;
-        chunk
-    }
-
-    #[inline]
-    #[cfg(not(stage0))]
     fn new(next: Option<Box<TypedArenaChunk<T>>>, capacity: uint)
            -> Box<TypedArenaChunk<T>> {
         let mut size = mem::size_of::<TypedArenaChunk<T>>();

branches/dist-snap/src/libcore/should_not_exist.rs

@@ -28,26 +28,10 @@ use str::StrSlice;
 
 #[allow(ctypes)]
 extern {
-    #[cfg(stage0)]
-    fn rust_malloc(size: uint) -> *u8;
-    #[cfg(not(stage0))]
     fn rust_malloc(size: uint, align: uint) -> *u8;
     fn rust_free(ptr: *u8, size: uint, align: uint);
 }
 
-#[cfg(stage0)]
-unsafe fn alloc(cap: uint) -> *mut Vec<()> {
-    let cap = cap.checked_add(&mem::size_of::<Vec<()>>()).unwrap();
-    let ret = rust_malloc(cap) as *mut Vec<()>;
-    if ret.is_null() {
-        intrinsics::abort();
-    }
-    (*ret).fill = 0;
-    (*ret).alloc = cap;
-    ret
-}
-
-#[cfg(not(stage0))]
 unsafe fn alloc(cap: uint) -> *mut Vec<()> {
     let cap = cap.checked_add(&mem::size_of::<Vec<()>>()).unwrap();
     // this should use the real alignment, but the new representation will take care of that

branches/dist-snap/src/librustc/back/arm.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use back::target_strs;
-use driver::config::cfg_os_to_meta_os;
+use driver::session::sess_os_to_meta_os;
 use metadata::loader::meta_section_name;
 use syntax::abi;
 
@@ -22,7 +22,7 @@ pub fn get_target_strs(target_triple: ~str, target_os: abi::Os) -> target_strs::
     return target_strs::t {
         module_asm: "".to_owned(),
 
-        meta_sect_name: meta_section_name(cfg_os_to_meta_os(target_os)).to_owned(),
+        meta_sect_name: meta_section_name(sess_os_to_meta_os(target_os)).to_owned(),
 
         data_layout: match target_os {
           abi::OsMacos => {

branches/dist-snap/src/librustc/back/link.rs

@@ -12,9 +12,8 @@ use back::archive::{Archive, METADATA_FILENAME};
 use back::rpath;
 use back::svh::Svh;
 use driver::driver::{CrateTranslation, OutputFilenames};
-use driver::config::NoDebugInfo;
-use driver::session::Session;
-use driver::config;
+use driver::session::{NoDebugInfo, Session};
+use driver::session;
 use lib::llvm::llvm;
 use lib::llvm::ModuleRef;
 use lib;
@@ -93,9 +92,8 @@ pub mod write {
     use back::link::{OutputTypeExe, OutputTypeLlvmAssembly};
     use back::link::{OutputTypeObject};
     use driver::driver::{CrateTranslation, OutputFilenames};
-    use driver::config::NoDebugInfo;
-    use driver::session::Session;
-    use driver::config;
+    use driver::session::{NoDebugInfo, Session};
+    use driver::session;
     use lib::llvm::llvm;
     use lib::llvm::{ModuleRef, TargetMachineRef, PassManagerRef};
     use lib;
@@ -141,10 +139,10 @@ pub mod write {
             }
 
             let opt_level = match sess.opts.optimize {
-              config::No => lib::llvm::CodeGenLevelNone,
-              config::Less => lib::llvm::CodeGenLevelLess,
-              config::Default => lib::llvm::CodeGenLevelDefault,
-              config::Aggressive => lib::llvm::CodeGenLevelAggressive,
+              session::No => lib::llvm::CodeGenLevelNone,
+              session::Less => lib::llvm::CodeGenLevelLess,
+              session::Default => lib::llvm::CodeGenLevelDefault,
+              session::Aggressive => lib::llvm::CodeGenLevelAggressive,
             };
             let use_softfp = sess.opts.cg.soft_float;
 
@@ -233,7 +231,7 @@ pub mod write {
             // emitting an rlib. Whenever an rlib is created, the bytecode is
             // inserted into the archive in order to allow LTO against it.
             if sess.opts.cg.save_temps ||
-               (sess.crate_types.borrow().contains(&config::CrateTypeRlib) &&
+               (sess.crate_types.borrow().contains(&session::CrateTypeRlib) &&
                 sess.opts.output_types.contains(&OutputTypeExe)) {
                 output.temp_path(OutputTypeBitcode).with_c_str(|buf| {
                     llvm::LLVMWriteBitcodeToFile(llmod, buf);
@@ -380,10 +378,10 @@ pub mod write {
         // Copy what clang does by turning on loop vectorization at O2 and
         // slp vectorization at O3
         let vectorize_loop = !sess.opts.cg.no_vectorize_loops &&
-                             (sess.opts.optimize == config::Default ||
-                              sess.opts.optimize == config::Aggressive);
+                             (sess.opts.optimize == session::Default ||
+                              sess.opts.optimize == session::Aggressive);
         let vectorize_slp = !sess.opts.cg.no_vectorize_slp &&
-                            sess.opts.optimize == config::Aggressive;
+                            sess.opts.optimize == session::Aggressive;
 
         let mut llvm_c_strs = Vec::new();
         let mut llvm_args = Vec::new();
@@ -825,14 +823,14 @@ fn is_writeable(p: &Path) -> bool {
     }
 }
 
-pub fn filename_for_input(sess: &Session, crate_type: config::CrateType,
+pub fn filename_for_input(sess: &Session, crate_type: session::CrateType,
                           id: &CrateId, out_filename: &Path) -> Path {
     let libname = output_lib_filename(id);
     match crate_type {
-        config::CrateTypeRlib => {
+        session::CrateTypeRlib => {
             out_filename.with_filename(format!("lib{}.rlib", libname))
         }
-        config::CrateTypeDylib => {
+        session::CrateTypeDylib => {
             let (prefix, suffix) = match sess.targ_cfg.os {
                 abi::OsWin32 => (loader::WIN32_DLL_PREFIX, loader::WIN32_DLL_SUFFIX),
                 abi::OsMacos => (loader::MACOS_DLL_PREFIX, loader::MACOS_DLL_SUFFIX),
@@ -842,16 +840,16 @@ pub fn filename_for_input(sess: &Session, crate_type: config::CrateType,
             };
             out_filename.with_filename(format!("{}{}{}", prefix, libname, suffix))
         }
-        config::CrateTypeStaticlib => {
+        session::CrateTypeStaticlib => {
             out_filename.with_filename(format!("lib{}.a", libname))
         }
-        config::CrateTypeExecutable => out_filename.clone(),
+        session::CrateTypeExecutable => out_filename.clone(),
     }
 }
 
 fn link_binary_output(sess: &Session,
                       trans: &CrateTranslation,
-                      crate_type: config::CrateType,
+                      crate_type: session::CrateType,
                       outputs: &OutputFilenames,
                       id: &CrateId) -> Path {
     let obj_filename = outputs.temp_path(OutputTypeObject);
@@ -879,16 +877,16 @@ fn link_binary_output(sess: &Session,
     }
 
     match crate_type {
-        config::CrateTypeRlib => {
+        session::CrateTypeRlib => {
             link_rlib(sess, Some(trans), &obj_filename, &out_filename);
         }
-        config::CrateTypeStaticlib => {
+        session::CrateTypeStaticlib => {
             link_staticlib(sess, &obj_filename, &out_filename);
         }
-        config::CrateTypeExecutable => {
+        session::CrateTypeExecutable => {
             link_natively(sess, trans, false, &obj_filename, &out_filename);
         }
-        config::CrateTypeDylib => {
+        session::CrateTypeDylib => {
             link_natively(sess, trans, true, &obj_filename, &out_filename);
         }
     }
@@ -1047,7 +1045,7 @@ fn link_natively(sess: &Session, trans: &CrateTranslation, dylib: bool,
     let mut cc_args = sess.targ_cfg.target_strs.cc_args.clone();
     cc_args.push_all_move(link_args(sess, dylib, tmpdir.path(), trans,
                                     obj_filename, out_filename));
-    if (sess.opts.debugging_opts & config::PRINT_LINK_ARGS) != 0 {
+    if (sess.opts.debugging_opts & session::PRINT_LINK_ARGS) != 0 {
         println!("{} link args: '{}'", cc_prog, cc_args.connect("' '"));
     }
 
@@ -1163,8 +1161,8 @@ fn link_args(sess: &Session,
 
         // GNU-style linkers support optimization with -O. GNU ld doesn't need a
         // numeric argument, but other linkers do.
-        if sess.opts.optimize == config::Default ||
-           sess.opts.optimize == config::Aggressive {
+        if sess.opts.optimize == session::Default ||
+           sess.opts.optimize == session::Aggressive {
             args.push("-Wl,-O1".to_owned());
         }
     } else if sess.targ_cfg.os == abi::OsMacos {
@@ -1375,9 +1373,9 @@ fn add_upstream_rust_crates(args: &mut Vec<~str>, sess: &Session,
     // involves just passing the right -l flag.
 
     let data = if dylib {
-        trans.crate_formats.get(&config::CrateTypeDylib)
+        trans.crate_formats.get(&session::CrateTypeDylib)
     } else {
-        trans.crate_formats.get(&config::CrateTypeExecutable)
+        trans.crate_formats.get(&session::CrateTypeExecutable)
     };
 
     // Invoke get_used_crates to ensure that we get a topological sorting of
@@ -1405,7 +1403,7 @@ fn add_upstream_rust_crates(args: &mut Vec<~str>, sess: &Session,
     }
 
     // Converts a library file-stem into a cc -l argument
-    fn unlib(config: &config::Config, stem: &str) -> ~str {
+    fn unlib(config: &session::Config, stem: &str) -> ~str {
         if stem.starts_with("lib") && config.os != abi::OsWin32 {
             stem.slice(3, stem.len()).to_owned()
         } else {

branches/dist-snap/src/librustc/back/lto.rs

@@ -11,7 +11,6 @@
 use back::archive::ArchiveRO;
 use back::link;
 use driver::session;
-use driver::config;
 use lib::llvm::{ModuleRef, TargetMachineRef, llvm, True, False};
 use metadata::cstore;
 use util::common::time;
@@ -30,7 +29,7 @@ pub fn run(sess: &session::Session, llmod: ModuleRef,
     // Make sure we actually can run LTO
     for crate_type in sess.crate_types.borrow().iter() {
         match *crate_type {
-            config::CrateTypeExecutable | config::CrateTypeStaticlib => {}
+            session::CrateTypeExecutable | session::CrateTypeStaticlib => {}
             _ => {
                 sess.fatal("lto can only be run for executables and \
                             static library outputs");

branches/dist-snap/src/librustc/back/mips.rs

@@ -9,15 +9,15 @@
 // except according to those terms.
 
 use back::target_strs;
-use driver::config::cfg_os_to_meta_os;
+use driver::session::sess_os_to_meta_os;
 use metadata::loader::meta_section_name;
 use syntax::abi;
 
 pub fn get_target_strs(target_triple: ~str, target_os: abi::Os) -> target_strs::t {
     return target_strs::t {
         module_asm: "".to_owned(),
 
-        meta_sect_name: meta_section_name(cfg_os_to_meta_os(target_os)).to_owned(),
+        meta_sect_name: meta_section_name(sess_os_to_meta_os(target_os)).to_owned(),
 
         data_layout: match target_os {
           abi::OsMacos => {

branches/dist-snap/src/librustc/back/x86.rs

@@ -10,15 +10,15 @@
 
 
 use back::target_strs;
-use driver::config::cfg_os_to_meta_os;
+use driver::session::sess_os_to_meta_os;
 use metadata::loader::meta_section_name;
 use syntax::abi;
 
 pub fn get_target_strs(target_triple: ~str, target_os: abi::Os) -> target_strs::t {
     return target_strs::t {
         module_asm: "".to_owned(),
 
-        meta_sect_name: meta_section_name(cfg_os_to_meta_os(target_os)).to_owned(),
+        meta_sect_name: meta_section_name(sess_os_to_meta_os(target_os)).to_owned(),
 
         data_layout: match target_os {
           abi::OsMacos => {

branches/dist-snap/src/librustc/back/x86_64.rs

@@ -10,15 +10,15 @@
 
 
 use back::target_strs;
-use driver::config::cfg_os_to_meta_os;
+use driver::session::sess_os_to_meta_os;
 use metadata::loader::meta_section_name;
 use syntax::abi;
 
 pub fn get_target_strs(target_triple: ~str, target_os: abi::Os) -> target_strs::t {
     return target_strs::t {
         module_asm: "".to_owned(),
 
-        meta_sect_name: meta_section_name(cfg_os_to_meta_os(target_os)).to_owned(),
+        meta_sect_name: meta_section_name(sess_os_to_meta_os(target_os)).to_owned(),
 
         data_layout: match target_os {
           abi::OsMacos => {