---

yaml
---
r: 138955
b: refs/heads/try2
c: 1e1efbf
h: refs/heads/master
i:
  138953: dc74c8b
  138951: e99ad57
v: v3

Author: jdm

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: a9643d39f8243dceb1184f446d988081a607d824
+refs/heads/try2: 1e1efbf2c355c4ddb1356abe535d79525bad72ba
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/RELEASES.txt

@@ -1,85 +1,8 @@
-Version 0.6 (March 2013)
+Version 0.6 (?)
 ---------------------------
 
-   * ~??? changes, numerous bugfixes
-
-   * TODO:
-      * Ord/Cmp
-      * Lifetime changes
-      * Implicit self
-      * Remove `static` keyword
-      * Static method syntax
-      * `as Trait`
-      * `copy` removed?
-
-   * Syntax changes
-      * The self type parameter in traits is now spelled `Self`
-      * Replaced the `Durable` trait with the `'static` lifetime
-      * The old closure type syntax with the trailing sigil has been
-        removed in favor of the more consistent leading sigil
-      * `super` is a keyword, and may be prefixed to paths
-      * Trait bounds are separated with `+` instead of whitespace
-      * Traits are implemented with `impl Trait for Type`
-        instead of `impl Type: Trait`
-      * The `export` keyword has finally been removed
-      * The `move` keyword has been removed (linear types move by default)
-      * The interior mutability qualifier on vectors, `[mut T]`, has been
-        removed. Use `&mut [T]`, etc.
-      * `mut` is no longer valid in `~mut T`. Use inherited mutability
-      * `fail` is no longer a keyword. Use `fail!()`
-      * `assert` is no longer a keyword. Use `assert!()`
-      * `log` is no longer a keyword. use `debug!`, etc.
-      * 1-tuples may be represented as `(T,)`
-      * Struct fields may no longer be `mut`. Use inherited mutability,
-        `@mut T`, `core::mut` or `core::cell`
-      * `extern mod { ... }` is no longer valid syntax for foreign
-        function modules. Use extern blocks: `extern { ... }`
-      * Newtype enums removed. Used tuple-structs.
-      * Trait implementations no longer support visibility modifiers
-
-   * Semantic changes
-      * Linear types move by default, eliminating the `move` keyword
-      * All foreign functions are considered unsafe
-      * &mut is now unaliasable
-      * Writes to borrowed @mut pointers are prevented dynamically
-      * () has size 0
-      * The name of the main function can be customized using #[main]
-      * The default type of an inferred closure is &fn instead of @fn
-      * Name resolution continues to be tweaked
-      * Method visibility is inherited from the implementation declaration
-
-   * Other language changes
-      * Structural records have been removed
-      * Many more types can be used in constants, including enums
-        `static lifetime pointers and vectors
-      * Pattern matching over vectors improved and expanded
-      * Typechecking of closure types has been overhauled to
-        improve inference and eliminate unsoundness
-
    * Libraries
-      * Lots of effort to organize the container API's around `core::container`
-      * `core::send_map` renamed to `core::hashmap`
-      * Added big integers to `std::bigint`
-      * Removed `core::oldcomm` module
-      * Added pipe-based `core::comm` module
-      * Reimplemented `std::treemap`
-      * Numeric traits have been reorganized under `core::num`
-      * `core::dvec` removed. Use `@mut ~[T]` or other language types
-      * `vec::slice` finally returns a slice
-      * `debug!` and friends don't require a format string, e.g. `debug!(Foo)`
-
-   * Tools
-      * Replaced the 'cargo' package manager with 'rustpkg'
-      * Added all-purpose 'rust' tool
-      * `rustc --test` now supports a benchmarks with the `#[bench]` attribute
-      * rustc now attempts to offer spelling suggestions
-
-   * Misc
-      * Improved support for ARM and Android
-      * Preliminary MIPS backend
-      * Improved foreign function ABI implementation for x86, x86_64
-      * Various and memory usage improvements
-      * Rust code may be embedded in foreign code under limited circumstances
+     * `core::send_map` renamed to `core::hashmap`
 
 Version 0.5 (December 2012)
 ---------------------------

branches/try2/src/etc/local_stage0.sh

@@ -46,4 +46,3 @@ cp ${PREFIX}/lib/rustc/${TARG_DIR}/${LIBDIR}/* ${TARG_DIR}/stage0/${LIBDIR}/
 cp ${PREFIX}/lib/librust*${LIB_SUF} ${TARG_DIR}/stage0/${LIBDIR}/
 cp ${PREFIX}/lib/libcore*${LIB_SUF} ${TARG_DIR}/stage0/${LIBDIR}/
 cp ${PREFIX}/lib/libstd*${LIB_SUF} ${TARG_DIR}/stage0/${LIBDIR}/
-cp ${PREFIX}/lib/libsyntax*${LIB_SUF} ${TARG_DIR}/stage0/${LIBDIR}/

branches/try2/src/libcore/option.rs

@@ -42,7 +42,6 @@ let unwrapped_msg = match msg {
 */
 
 use cmp::{Eq,Ord};
-use ops::Add;
 use kinds::Copy;
 use util;
 use num::Zero;
@@ -86,18 +85,6 @@ impl<T:Ord> Ord for Option<T> {
     }
 }
 
-impl<T: Copy + Add<T,T>> Add<Option<T>, Option<T>> for Option<T> {
-    #[inline(always)]
-    pure fn add(&self, other: &Option<T>) -> Option<T> {
-        match (*self, *other) {
-            (None, None) => None,
-            (_, None) => *self,
-            (None, _) => *other,
-            (Some(ref lhs), Some(ref rhs)) => Some(*lhs + *rhs)
-        }
-    }
-}
-
 #[inline(always)]
 pub pure fn get<T:Copy>(opt: Option<T>) -> T {
     /*!

branches/try2/src/libcore/rt/context.rs

@@ -65,42 +65,7 @@ extern {
     fn swap_registers(out_regs: *mut Registers, in_regs: *Registers);
 }
 
-#[cfg(target_arch = "x86")]
-struct Registers {
-    eax: u32, ebx: u32, ecx: u32, edx: u32,
-    ebp: u32, esi: u32, edi: u32, esp: u32,
-    cs: u16, ds: u16, ss: u16, es: u16, fs: u16, gs: u16,
-    eflags: u32, eip: u32
-}
-
-#[cfg(target_arch = "x86")]
-fn new_regs() -> ~Registers {
-    ~Registers {
-        eax: 0, ebx: 0, ecx: 0, edx: 0,
-        ebp: 0, esi: 0, edi: 0, esp: 0,
-        cs: 0, ds: 0, ss: 0, es: 0, fs: 0, gs: 0,
-        eflags: 0, eip: 0
-    }
-}
-
-#[cfg(target_arch = "x86")]
-fn initialize_call_frame(regs: &mut Registers,
-                         fptr: *c_void, arg: *c_void, sp: *mut uint) {
-
-    let sp = align_down(sp);
-    let sp = mut_offset(sp, -4); // XXX: -4 words? Needs this be done at all?
-
-    unsafe { *sp = arg as uint; }
-    let sp = mut_offset(sp, -1);
-    unsafe { *sp = 0; } // The final return address
-
-    regs.esp = sp as u32;
-    regs.eip = fptr as u32;
-
-    // Last base pointer on the stack is 0
-    regs.ebp = 0;
-}
-
+// Definitions of these registers are in rt/arch/x86_64/regs.h
 #[cfg(target_arch = "x86_64")]
 type Registers = [uint * 22];
 
@@ -136,42 +101,40 @@ fn initialize_call_frame(regs: &mut Registers,
     regs[RUSTRT_RBP] = 0;
 }
 
-#[cfg(target_arch = "arm")]
-type Registers = [uint * 32];
+#[cfg(target_arch = "x86")]
+struct Registers {
+    eax: u32, ebx: u32, ecx: u32, edx: u32,
+    ebp: u32, esi: u32, edi: u32, esp: u32,
+    cs: u16, ds: u16, ss: u16, es: u16, fs: u16, gs: u16,
+    eflags: u32, eip: u32
+}
 
-#[cfg(target_arch = "arm")]
-fn new_regs() -> ~Registers { ~[0, .. 32] }
+#[cfg(target_arch = "x86")]
+fn new_regs() -> ~Registers {
+    ~Registers {
+        eax: 0, ebx: 0, ecx: 0, edx: 0,
+        ebp: 0, esi: 0, edi: 0, esp: 0,
+        cs: 0, ds: 0, ss: 0, es: 0, fs: 0, gs: 0,
+        eflags: 0, eip: 0
+    }
+}
 
-#[cfg(target_arch = "arm")]
+#[cfg(target_arch = "x86")]
 fn initialize_call_frame(regs: &mut Registers,
                          fptr: *c_void, arg: *c_void, sp: *mut uint) {
-    let sp = mut_offset(sp, -1);
 
-    // The final return address. 0 indicates the bottom of the stack
-    unsafe { *sp = 0; }
-
-    regs[0] = arg as uint;   // r0
-    regs[13] = sp as uint;   // #53 sp, r13
-    regs[14] = fptr as uint; // #60 pc, r15 --> lr
-}
-
-#[cfg(target_arch = "mips")]
-type Registers = [uint * 32];
-
-#[cfg(target_arch = "mips")]
-fn new_regs() -> ~Registers { ~[0, .. 32] }
+    let sp = align_down(sp);
+    let sp = mut_offset(sp, -4); // XXX: -4 words? Needs this be done at all?
 
-#[cfg(target_arch = "mips")]
-fn initialize_call_frame(regs: &mut Registers,
-                         fptr: *c_void, arg: *c_void, sp: *mut uint) {
+    unsafe { *sp = arg as uint; }
     let sp = mut_offset(sp, -1);
+    unsafe { *sp = 0; } // The final return address
 
-    // The final return address. 0 indicates the bottom of the stack
-    unsafe { *sp = 0; }
+    regs.esp = sp as u32;
+    regs.eip = fptr as u32;
 
-    regs[4] = arg as uint;
-    regs[29] = sp as uint;
-    regs[31] = fptr as uint;
+    // Last base pointer on the stack is 0
+    regs.ebp = 0;
 }
 
 fn align_down(sp: *mut uint) -> *mut uint {

branches/try2/src/libcore/rt/mod.rs

@@ -8,6 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// XXX: Missing some implementation for other architectures
+#[cfg(target_os = "linux")];
+#[cfg(target_os = "mac")];
+#[cfg(target_os = "win32")];
+
 // Some basic logging
 macro_rules! rtdebug (
     ($( $arg:expr),+) => ( {

branches/try2/src/librustc/back/link.rs

@@ -818,7 +818,11 @@ pub fn link_binary(sess: Session,
     do cstore::iter_crate_data(cstore) |crate_num, _| {
         let link_args = csearch::get_link_args_for_crate(cstore, crate_num);
         do vec::consume(link_args) |_, link_arg| {
-            cc_args.push(link_arg);
+            // Linker arguments that don't begin with - are likely file names,
+            // so they should not be necessary.
+            if link_arg.starts_with("-") {
+              cc_args.push(link_arg);
+            }
         }
     }
 

branches/try2/src/librustc/lib/llvm.rs

@@ -188,12 +188,6 @@ pub enum Metadata {
     MD_tbaa_struct = 5
 }
 
-// Inline Asm Dialect
-pub enum AsmDialect {
-    AD_ATT   = 0,
-    AD_Intel = 1
-}
-
 // Opaque pointer types
 pub enum Module_opaque {}
 pub type ModuleRef = *Module_opaque;
@@ -223,9 +217,9 @@ pub enum SectionIterator_opaque {}
 pub type SectionIteratorRef = *SectionIterator_opaque;
 
 pub mod llvm {
-    use super::{AsmDialect, AtomicBinOp, AtomicOrdering, BasicBlockRef};
-    use super::{Bool, BuilderRef, ContextRef, MemoryBufferRef, ModuleRef};
-    use super::{ObjectFileRef, Opcode, PassManagerRef, PassManagerBuilderRef};
+    use super::{AtomicBinOp, AtomicOrdering, BasicBlockRef, Bool, BuilderRef};
+    use super::{ContextRef, MemoryBufferRef, ModuleRef, ObjectFileRef};
+    use super::{Opcode, PassManagerRef, PassManagerBuilderRef};
     use super::{SectionIteratorRef, TargetDataRef, TypeKind, TypeRef, UseRef};
     use super::{ValueRef};
 
@@ -1439,12 +1433,6 @@ pub mod llvm {
 
         /** Enables LLVM debug output. */
         pub unsafe fn LLVMSetDebug(Enabled: c_int);
-
-        /** Prepares inline assembly. */
-        pub unsafe fn LLVMInlineAsm(Ty: TypeRef, AsmString: *c_char,
-                                    Constraints: *c_char, SideEffects: Bool,
-                                    AlignStack: Bool, Dialect: AsmDialect)
-                                 -> ValueRef;
     }
 }
 

branches/try2/src/librustc/middle/check_const.rs

@@ -91,8 +91,8 @@ pub fn check_expr(sess: Session,
                   v: visit::vt<bool>) {
     if is_const {
         match e.node {
-          expr_unary(deref, _) => { }
-          expr_unary(box(_), _) | expr_unary(uniq(_), _) => {
+          expr_unary(box(_), _) | expr_unary(uniq(_), _) |
+          expr_unary(deref, _) => {
             sess.span_err(e.span,
                           ~"disallowed operator in constant expression");
             return;

branches/try2/src/librustc/middle/liveness.rs

@@ -620,8 +620,7 @@ fn visit_expr(expr: @expr, &&self: @mut IrMaps, vt: vt<@mut IrMaps>) {
       expr_do_body(*) | expr_cast(*) | expr_unary(*) | expr_break(_) |
       expr_again(_) | expr_lit(_) | expr_ret(*) | expr_block(*) |
       expr_assign(*) | expr_swap(*) | expr_assign_op(*) | expr_mac(*) |
-      expr_struct(*) | expr_repeat(*) | expr_paren(*) |
-      expr_inline_asm(*) => {
+      expr_struct(*) | expr_repeat(*) | expr_paren(*) => {
           visit::visit_expr(expr, self, vt);
       }
     }
@@ -1346,7 +1345,6 @@ pub impl Liveness {
             self.propagate_through_expr(e, succ)
           }
 
-          expr_inline_asm(*) |
           expr_lit(*) => {
             succ
           }
@@ -1620,7 +1618,7 @@ fn check_expr(expr: @expr, &&self: @Liveness, vt: vt<@Liveness>) {
       expr_cast(*) | expr_unary(*) | expr_ret(*) | expr_break(*) |
       expr_again(*) | expr_lit(_) | expr_block(*) | expr_swap(*) |
       expr_mac(*) | expr_addr_of(*) | expr_struct(*) | expr_repeat(*) |
-      expr_paren(*) | expr_inline_asm(*) => {
+      expr_paren(*) => {
         visit::visit_expr(expr, self, vt);
       }
     }

branches/try2/src/librustc/middle/mem_categorization.rs

@@ -447,7 +447,7 @@ pub impl mem_categorization_ctxt {
           ast::expr_while(*) | ast::expr_block(*) | ast::expr_loop(*) |
           ast::expr_match(*) | ast::expr_lit(*) | ast::expr_break(*) |
           ast::expr_mac(*) | ast::expr_again(*) | ast::expr_struct(*) |
-          ast::expr_repeat(*) | ast::expr_inline_asm(*) => {
+          ast::expr_repeat(*) => {
             return self.cat_rvalue(expr, expr_ty);
           }
         }

branches/try2/src/librustc/middle/moves.rs

@@ -560,8 +560,7 @@ pub impl VisitContext {
 
             expr_break(*) |
             expr_again(*) |
-            expr_lit(*)   |
-            expr_inline_asm(*) => {}
+            expr_lit(*) => {}
 
             expr_loop(ref blk, _) => {
                 self.consume_block(blk, visitor);