---

yaml
---
r: 63873
b: refs/heads/snap-stage3
c: 8883099
h: refs/heads/master
i:
  63871: 2ae6147
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 2a40c5db469b5065f64c69ae7874f162ff2669a8
+refs/heads/snap-stage3: 88830996d811be3ff833ba590c98f28daaf31f43
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/Makefile.in

@@ -540,10 +540,19 @@ ALL_TARGET_RULES = $(foreach target,$(CFG_TARGET_TRIPLES), \
 	$(foreach host,$(CFG_HOST_TRIPLES), \
  all-target-$(target)-host-$(host)))
 
-all: $(ALL_TARGET_RULES) $(GENERATED) docs
+all: rustllvm/llvm-auto-clean-stamp \
+     $(ALL_TARGET_RULES) $(GENERATED) docs
 
 endif
 
+# This is used to independently force an LLVM clean rebuild
+# when we changed something not otherwise captured by builtin
+# dependencies. In these cases, commit a change that touches
+# the stamp in the source dir.
+rustllvm/llvm-auto-clean-stamp: $(S)src/rustllvm/llvm-auto-clean-trigger
+	$(Q)$(MAKE) clean-llvm
+	touch $@
+
 
 ######################################################################
 # Re-configuration

branches/snap-stage3/mk/clean.mk

@@ -23,7 +23,7 @@ CLEAN_LLVM_RULES = 								\
  $(foreach target, $(CFG_TARGET_TRIPLES),		\
   clean-llvm$(target))
 
-.PHONY: clean clean-all clean-misc
+.PHONY: clean clean-all clean-misc clean-llvm
 
 clean-all: clean clean-llvm
 

branches/snap-stage3/src/librustc/middle/trans/callee.rs

@@ -615,7 +615,10 @@ pub fn trans_call_inner(in_cx: block,
                 }
                 Method(d) => {
                     // Weird but true: we pass self in the *environment* slot!
-                    (d.llfn, d.llself)
+                    let llself = PointerCast(bcx,
+                                             d.llself,
+                                             Type::opaque_box(ccx).ptr_to());
+                    (d.llfn, llself)
                 }
                 Closure(d) => {
                     // Closures are represented as (llfn, llclosure) pair:
@@ -927,7 +930,7 @@ pub fn trans_arg_expr(bcx: block,
                                 ByRef(_) => val = scratch.val,
                             }
                         } else {
-                            debug!("by copy arg with type %s", bcx.ty_to_str(arg_datum.ty));
+                            debug!("by copy arg with type %s");
                             match arg_datum.mode {
                                 ByRef(_) => val = Load(bcx, arg_datum.val),
                                 ByValue => val = arg_datum.val,
@@ -941,6 +944,10 @@ pub fn trans_arg_expr(bcx: block,
         if formal_arg_ty != arg_datum.ty {
             // this could happen due to e.g. subtyping
             let llformal_arg_ty = type_of::type_of_explicit_arg(ccx, &formal_arg_ty);
+            let llformal_arg_ty = match self_mode {
+                ty::ByRef => llformal_arg_ty.ptr_to(),
+                ty::ByCopy => llformal_arg_ty,
+            };
             debug!("casting actual type (%s) to match formal (%s)",
                    bcx.val_to_str(val), bcx.llty_str(llformal_arg_ty));
             val = PointerCast(bcx, val, llformal_arg_ty);

branches/snap-stage3/src/librustc/middle/trans/meth.rs

@@ -133,8 +133,8 @@ pub fn trans_self_arg(bcx: block,
     let _icx = push_ctxt("impl::trans_self_arg");
     let mut temp_cleanups = ~[];
 
-    // self is passed as an opaque box in the environment slot
-    let self_ty = ty::mk_opaque_box(bcx.tcx());
+    // Compute the type of self.
+    let self_ty = monomorphize_type(bcx, mentry.self_ty);
     let result = trans_arg_expr(bcx,
                                 self_ty,
                                 mentry.self_mode,
@@ -576,6 +576,7 @@ pub fn trans_trait_callee_from_llval(bcx: block,
     let llbox = Load(bcx, GEPi(bcx, llpair, [0u, abi::trt_field_box]));
 
     // Munge `llself` appropriately for the type of `self` in the method.
+    let self_mode;
     match explicit_self {
         ast::sty_static => {
             bcx.tcx().sess.bug("shouldn't see static method here");
@@ -596,6 +597,12 @@ pub fn trans_trait_callee_from_llval(bcx: block,
                     llself = llbox;
                 }
             }
+
+            let llscratch = alloca(bcx, val_ty(llself));
+            Store(bcx, llself, llscratch);
+            llself = llscratch;
+
+            self_mode = ty::ByRef;
         }
         ast::sty_box(_) => {
             // Bump the reference count on the box.
@@ -608,20 +615,28 @@ pub fn trans_trait_callee_from_llval(bcx: block,
                 ty::BoxTraitStore => llself = llbox,
                 _ => bcx.tcx().sess.bug("@self receiver with non-@Trait")
             }
+
+            let llscratch = alloca(bcx, val_ty(llself));
+            Store(bcx, llself, llscratch);
+            llself = llscratch;
+
+            self_mode = ty::ByRef;
         }
         ast::sty_uniq(_) => {
             // Pass the unique pointer.
             match store {
                 ty::UniqTraitStore => llself = llbox,
                 _ => bcx.tcx().sess.bug("~self receiver with non-~Trait")
             }
+
+            let llscratch = alloca(bcx, val_ty(llself));
+            Store(bcx, llself, llscratch);
+            llself = llscratch;
+
+            self_mode = ty::ByRef;
         }
     }
 
-    let llscratch = alloca(bcx, val_ty(llself));
-    Store(bcx, llself, llscratch);
-    llself = PointerCast(bcx, llscratch, Type::opaque_box(ccx).ptr_to());
-
     // Load the function from the vtable and cast it to the expected type.
     debug!("(translating trait callee) loading method");
     let llcallee_ty = type_of_fn_from_ty(ccx, callee_ty);
@@ -637,7 +652,7 @@ pub fn trans_trait_callee_from_llval(bcx: block,
             llfn: mptr,
             llself: llself,
             self_ty: ty::mk_opaque_box(bcx.tcx()),
-            self_mode: ty::ByRef,
+            self_mode: self_mode,
             explicit_self: explicit_self
             /* XXX: Some(llbox) */
         })

branches/snap-stage3/src/rustllvm/llvm-auto-clean-trigger

@@ -0,0 +1,29 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+
+use std::io;
+
+macro_rules! print_hd_tl (
+    ($field_hd:ident, $($field_tl:ident),+) => ({
+        io::print(stringify!($field)); //~ ERROR unknown macro variable
+        io::print("::[");
+        $(
+            io::print(stringify!($field_tl));
+            io::print(", ");
+        )+
+        io::print("]\n");
+    })
+)
+
+fn main() {
+    print_hd_tl!(x, y, z, w)
+}
+

branches/snap-stage3/src/test/compile-fail/issue-5060-fail.rs

@@ -0,0 +1,21 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use std::{pipes, io, task, comm};
+
+fn main() {
+    let (port, chan) = comm::stream();
+
+    do task::spawn {
+        io::println(port.recv());
+    }
+
+    chan.send("hello, world");
+}

branches/snap-stage3/src/test/run-pass/issue-4446.rs

@@ -0,0 +1,28 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use std::io;
+
+macro_rules! print_hd_tl (
+    ($field_hd:ident, $($field_tl:ident),+) => ({
+        io::print(stringify!($field_hd));
+        io::print("::[");
+        $(
+            io::print(stringify!($field_tl));
+            io::print(", ");
+        )+
+        io::print("]\n");
+    })
+)
+
+fn main() {
+    print_hd_tl!(x, y, z, w)
+}
+

branches/snap-stage3/src/test/run-pass/issue-5060.rs

@@ -0,0 +1,44 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+pub trait EventLoop {
+}
+
+pub struct UvEventLoop {
+    uvio: int
+}
+
+impl UvEventLoop {
+    pub fn new() -> UvEventLoop {
+        UvEventLoop {
+            uvio: 0
+        }
+    }
+}
+
+impl EventLoop for UvEventLoop {
+}
+
+pub struct Scheduler {
+    event_loop: ~EventLoop,
+}
+
+impl Scheduler {
+
+    pub fn new(event_loop: ~EventLoop) -> Scheduler {
+        Scheduler {
+            event_loop: event_loop,
+        }
+    }
+}
+
+fn main() {
+    let mut sched = Scheduler::new(~UvEventLoop::new() as ~EventLoop);
+}

branches/snap-stage3/src/test/run-pass/issue-5192.rs

@@ -0,0 +1,27 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// xfail-test
+
+type FontTableTag = u32;
+
+trait FontTableTagConversions {
+  fn tag_to_str(self);
+}
+
+impl FontTableTagConversions for FontTableTag {
+  fn tag_to_str(self) {
+    &self;
+  }
+}
+
+fn main() {
+    5.tag_to_str();
+}