---

yaml
---
r: 65160
b: refs/heads/master
c: 9390cda
h: refs/heads/master
v: v3

Author: sanxiyn

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: dc7b83d18659503f47ae622918c3576d430a926e
+refs/heads/master: 9390cdaa8b0a35c025a322d458fb54ab015f58f4
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/src/libcore/rt/context.rs

@@ -183,9 +183,7 @@ fn new_regs() -> ~Registers { ~([0, .. 32]) }
 
 #[cfg(target_arch = "mips")]
 fn initialize_call_frame(regs: &mut Registers, fptr: *c_void, arg: *c_void, sp: *mut uint) {
-    let sp = align_down(sp);
-    // sp of mips o32 is 8-byte aligned
-    let sp = mut_offset(sp, -2);
+    let sp = mut_offset(sp, -1);
 
     // The final return address. 0 indicates the bottom of the stack
     unsafe { *sp = 0; }

trunk/src/libcore/vec.rs

@@ -22,7 +22,7 @@ use old_iter;
 use iterator::Iterator;
 use kinds::Copy;
 use libc;
-use old_iter::CopyableIter;
+use old_iter::{BaseIter, CopyableIter};
 use option::{None, Option, Some};
 use ptr::to_unsafe_ptr;
 use ptr;

trunk/src/librustc/middle/resolve.rs

@@ -1834,10 +1834,6 @@ pub impl Resolver {
                         debug!("(building import directive) bumping \
                                 reference");
                         resolution.outstanding_references += 1;
-
-                        // the source of this name is different now
-                        resolution.privacy = privacy;
-                        resolution.id = id;
                     }
                     None => {
                         debug!("(building import directive) creating new");

trunk/src/libsyntax/parse/parser.rs

@@ -1311,7 +1311,7 @@ pub impl Parser {
                     ex = expr_vec(~[first_expr], mutbl);
                 }
             }
-            hi = self.span.hi;
+            hi = self.last_span.hi;
         } else if self.eat_keyword("__log") {
             // LOG expression
             self.expect(&token::LPAREN);

trunk/src/rt/arch/mips/context.cpp

@@ -34,11 +34,9 @@ void context::call(void *f, void *arg, void *stack)
 
   // set up the stack
   uint32_t *sp = (uint32_t *)stack;
-  sp = align_down(sp);
+  //sp = align_down(sp);
   // The final return address. 0 indicates the bottom of the stack
-  // sp of mips o32 is 8-byte aligned
-  sp -= 2;
-  *sp = 0;
+  *--sp = 0;
 
   regs.data[4] = (uint32_t)arg;
   regs.data[29] = (uint32_t)sp;