---

yaml
---
r: 66975
b: refs/heads/master
c: b171413
h: refs/heads/master
i:
  66973: d15148b
  66971: 9243bac
  66967: b074a9a
  66959: 9619217
  66943: 19765ce
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 0239a06a6401d789a70c0089ada071ca981874df
+refs/heads/master: b17141370f316578e98164a37b2d4645d51b7095
 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/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 {

trunk/src/libstd/rt/test.rs

@@ -69,7 +69,7 @@ pub fn run_in_mt_newsched_task(f: ~fn()) {
     let f_cell = Cell::new(f);
 
     do run_in_bare_thread {
-        let nthreads = match os::getenv("RUST_TEST_THREADS") {
+        let nthreads = match os::getenv("RUST_RT_TEST_THREADS") {
             Some(nstr) => FromStr::from_str(nstr).get(),
             None => {
                 // Using more threads than cores in test code

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/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 }