---

yaml
---
r: 66996
b: refs/heads/master
c: 0ce9135
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 0c7b220f20367cde776b9e854b905745c9a271e2
+refs/heads/master: 0ce9135d71f6fd59da133e1cc685cf606582ae87
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/src/librustc/middle/trans/closure.rs

@@ -174,6 +174,16 @@ pub fn allocate_cbox(bcx: block, sigil: ast::Sigil, cdata_ty: ty::t)
     let ccx = bcx.ccx();
     let tcx = ccx.tcx;
 
+    fn nuke_ref_count(bcx: block, llbox: ValueRef) {
+        let _icx = push_ctxt("closure::nuke_ref_count");
+        // Initialize ref count to arbitrary value for debugging:
+        let ccx = bcx.ccx();
+        let llbox = PointerCast(bcx, llbox, Type::opaque_box(ccx).ptr_to());
+        let ref_cnt = GEPi(bcx, llbox, [0u, abi::box_field_refcnt]);
+        let rc = C_int(ccx, 0x12345678);
+        Store(bcx, rc, ref_cnt);
+    }
+
     // Allocate and initialize the box:
     match sigil {
         ast::ManagedSigil => {
@@ -185,6 +195,7 @@ pub fn allocate_cbox(bcx: block, sigil: ast::Sigil, cdata_ty: ty::t)
         ast::BorrowedSigil => {
             let cbox_ty = tuplify_box_ty(tcx, cdata_ty);
             let llbox = alloc_ty(bcx, cbox_ty, "__closure");
+            nuke_ref_count(bcx, llbox);
             rslt(bcx, llbox)
         }
     }

trunk/src/libstd/ptr.rs

@@ -80,7 +80,8 @@ pub fn is_not_null<T>(ptr: *const T) -> bool { !is_null(ptr) }
 #[inline]
 #[cfg(target_word_size = "32")]
 pub unsafe fn copy_memory<T>(dst: *mut T, src: *const T, count: uint) {
-    intrinsics::memmove32(dst, src as *T, count as u32);
+    use unstable::intrinsics::memmove32;
+    memmove32(dst, src as *T, count as u32);
 }
 
 /**
@@ -92,7 +93,8 @@ pub unsafe fn copy_memory<T>(dst: *mut T, src: *const T, count: uint) {
 #[inline]
 #[cfg(target_word_size = "64")]
 pub unsafe fn copy_memory<T>(dst: *mut T, src: *const T, count: uint) {
-    intrinsics::memmove64(dst, src as *T, count as u64);
+    use unstable::intrinsics::memmove64;
+    memmove64(dst, src as *T, count as u64);
 }
 
 /**
@@ -104,7 +106,8 @@ pub unsafe fn copy_memory<T>(dst: *mut T, src: *const T, count: uint) {
 #[inline]
 #[cfg(target_word_size = "32")]
 pub unsafe fn copy_nonoverlapping_memory<T>(dst: *mut T, src: *const T, count: uint) {
-    intrinsics::memcpy32(dst, src as *T, count as u32);
+    use unstable::intrinsics::memcpy32;
+    memcpy32(dst, src as *T, count as u32);
 }
 
 /**
@@ -116,7 +119,8 @@ pub unsafe fn copy_nonoverlapping_memory<T>(dst: *mut T, src: *const T, count: u
 #[inline]
 #[cfg(target_word_size = "64")]
 pub unsafe fn copy_nonoverlapping_memory<T>(dst: *mut T, src: *const T, count: uint) {
-    intrinsics::memcpy64(dst, src as *T, count as u64);
+    use unstable::intrinsics::memcpy64;
+    memcpy64(dst, src as *T, count as u64);
 }
 
 /**
@@ -126,7 +130,8 @@ pub unsafe fn copy_nonoverlapping_memory<T>(dst: *mut T, src: *const T, count: u
 #[inline]
 #[cfg(target_word_size = "32")]
 pub unsafe fn set_memory<T>(dst: *mut T, c: u8, count: uint) {
-    intrinsics::memset32(dst, c, count as u32);
+    use unstable::intrinsics::memset32;
+    memset32(dst, c, count as u32);
 }
 
 /**
@@ -136,17 +141,34 @@ pub unsafe fn set_memory<T>(dst: *mut T, c: u8, count: uint) {
 #[inline]
 #[cfg(target_word_size = "64")]
 pub unsafe fn set_memory<T>(dst: *mut T, c: u8, count: uint) {
-    intrinsics::memset64(dst, c, count as u64);
+    use unstable::intrinsics::memset64;
+    memset64(dst, c, count as u64);
 }
 
 /**
  * Zeroes out `count * size_of::<T>` bytes of memory at `dst`
  */
 #[inline]
+#[cfg(not(stage0))]
 pub unsafe fn zero_memory<T>(dst: *mut T, count: uint) {
     set_memory(dst, 0, count);
 }
 
+/**
+ * Zeroes out `count * size_of::<T>` bytes of memory at `dst`
+ */
+#[inline]
+#[cfg(stage0)]
+pub unsafe fn zero_memory<T>(dst: *mut T, count: uint) {
+    let mut count = count * sys::size_of::<T>();
+    let mut dst = dst as *mut u8;
+    while count > 0 {
+        *dst = 0;
+        dst = mut_offset(dst, 1);
+        count -= 1;
+    }
+}
+
 /**
  * Swap the values at two mutable locations of the same type, without
  * deinitialising or copying either one.

trunk/src/libstd/reflect.rs

@@ -197,7 +197,6 @@ impl<V:TyVisitor + MovePtr> TyVisitor for MovePtrAdaptor<V> {
         true
     }
 
-    #[cfg(stage0)]
     fn visit_str(&self) -> bool {
         self.align_to::<~str>();
         if ! self.inner.visit_str() { return false; }

trunk/src/libstd/repr.rs

@@ -269,7 +269,6 @@ impl TyVisitor for ReprVisitor {
     }
 
     // Type no longer exists, vestigial function.
-    #[cfg(stage0)]
     fn visit_str(&self) -> bool { fail!(); }
 
     fn visit_estr_box(&self) -> bool {
@@ -353,15 +352,6 @@ impl TyVisitor for ReprVisitor {
         }
     }
 
-    #[cfg(stage0)]
-    fn visit_evec_uniq(&self, mtbl: uint, inner: *TyDesc) -> bool {
-        do self.get::<&VecRepr> |b| {
-            self.writer.write_char('~');
-            self.write_unboxed_vec_repr(mtbl, &b.unboxed, inner);
-        }
-    }
-
-    #[cfg(not(stage0))]
     fn visit_evec_uniq(&self, mtbl: uint, inner: *TyDesc) -> bool {
         do self.get::<&UnboxedVecRepr> |b| {
             self.writer.write_char('~');

trunk/src/libstd/unstable/intrinsics.rs

@@ -82,6 +82,7 @@ pub trait TyVisitor {
     fn visit_f64(&self) -> bool;
 
     fn visit_char(&self) -> bool;
+    fn visit_str(&self) -> bool;
 
     fn visit_estr_box(&self) -> bool;
     fn visit_estr_uniq(&self) -> bool;

trunk/src/test/compile-fail/issue-5883.rs

@@ -0,0 +1,23 @@
+// 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;
+
+struct Struct {
+    r: io::Reader //~ ERROR reference to trait `io::Reader` where a type is expected
+}
+
+fn new_struct(r: io::Reader) -> Struct { //~ ERROR reference to trait `io::Reader` where a type is expected
+    Struct { r: r }
+}
+
+trait Curve {}
+enum E {X(Curve)} //~ ERROR reference to trait `Curve` where a type is expected
+fn main() {}

trunk/src/test/run-pass/issue-6153.rs

@@ -0,0 +1,20 @@
+// 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.
+
+fn swap(f: &fn(~[int]) -> ~[int]) -> ~[int] {
+    let x = ~[1, 2, 3];
+    f(x)
+}
+
+fn main() {
+    let v = swap(|mut x| { x.push(4); x });
+    let w = do swap |mut x| { x.push(4); x };
+    assert_eq!(v, w);
+}

trunk/src/test/run-pass/reflect-visit-data.rs

@@ -181,6 +181,13 @@ impl<V:TyVisitor + movable_ptr> TyVisitor for ptr_visit_adaptor<V> {
         true
     }
 
+    fn visit_str(&self) -> bool {
+        self.align_to::<~str>();
+        if ! self.inner.visit_str() { return false; }
+        self.bump_past::<~str>();
+        true
+    }
+
     fn visit_estr_box(&self) -> bool {
         self.align_to::<@str>();
         if ! self.inner.visit_estr_box() { return false; }
@@ -549,6 +556,7 @@ impl TyVisitor for my_visitor {
     fn visit_f64(&self) -> bool { true }
 
     fn visit_char(&self) -> bool { true }
+    fn visit_str(&self) -> bool { true }
 
     fn visit_estr_box(&self) -> bool { true }
     fn visit_estr_uniq(&self) -> bool { true }

trunk/src/test/run-pass/reflect-visit-type.rs

@@ -59,6 +59,7 @@ impl TyVisitor for MyVisitor {
     fn visit_f64(&self) -> bool { true }
 
     fn visit_char(&self) -> bool { true }
+    fn visit_str(&self) -> bool { true }
 
     fn visit_estr_box(&self) -> bool { true }
     fn visit_estr_uniq(&self) -> bool { true }