---

yaml
---
r: 4771
b: refs/heads/master
c: 702fe5c
h: refs/heads/master
i:
  4769: 15bc573
  4767: 1c784cc
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3aab46b0209adad0fd6f24b5b94b6401b13257b7
+refs/heads/master: 702fe5cdac4f6852689c1e74c3ca95af249f4285

trunk/src/comp/middle/trans.rs

@@ -466,15 +466,17 @@ fn alloca(cx: &@block_ctxt, t: TypeRef) -> ValueRef {
 }
 
 fn array_alloca(cx: &@block_ctxt, t: TypeRef, n: ValueRef) -> ValueRef {
+    let builder = new_builder(cx.fcx.lldynamicallocas);
     alt bcx_fcx(cx).llobstacktoken {
         none. {
+            let dynastack_mark = bcx_ccx(cx).upcalls.dynastack_mark;
+            let lltaskptr = bcx_fcx(cx).lltaskptr;
             bcx_fcx(cx).llobstacktoken =
-                some(cx.build.Call(bcx_ccx(cx).upcalls.dynastack_mark,
-                     ~[bcx_fcx(cx).lltaskptr]));
+                some(builder.Call(dynastack_mark, ~[lltaskptr]));
         }
         some(_) { /* no-op */ }
     }
-    ret new_builder(cx.fcx.lldynamicallocas).ArrayAlloca(t, n);
+    ret builder.ArrayAlloca(t, n);
 }
 
 
@@ -1266,6 +1268,8 @@ fn make_copy_glue(cx: &@block_ctxt, v: ValueRef, t: &ty::t) {
         bcx = duplicate_heap_parts_if_necessary(cx, v, t).bcx;
         bcx = iter_structural_ty(bcx, v, t, bind copy_ty(_, _, _)).bcx;
     } else { bcx = cx; }
+
+    trans_fn_cleanups(bcx);
     bcx.build.RetVoid();
 }
 
@@ -1371,7 +1375,9 @@ fn make_free_glue(cx: &@block_ctxt, v0: ValueRef, t: &ty::t) {
           }
           _ { rslt(cx, C_nil()) }
         };
-    rs.bcx.build.RetVoid();
+
+    let bcx = trans_fn_cleanups(rs.bcx);
+    bcx.build.RetVoid();
 }
 
 fn maybe_free_ivec_heap_part(cx: &@block_ctxt, v0: ValueRef, unit_ty: ty::t)
@@ -1439,7 +1445,9 @@ fn make_drop_glue(cx: &@block_ctxt, v0: ValueRef, t: &ty::t) {
             } else { rslt(cx, C_nil()) }
           }
         };
-    rs.bcx.build.RetVoid();
+
+    let bcx = trans_fn_cleanups(rs.bcx);
+    bcx.build.RetVoid();
 }
 
 fn trans_res_drop(cx: @block_ctxt, rs: ValueRef, did: &ast::def_id,
@@ -3719,7 +3727,8 @@ fn trans_for_each(cx: &@block_ctxt, local: &@ast::local, seq: &@ast::expr,
 
     if !r.bcx.build.is_terminated() {
         // if terminated is true, no need for the ret-fail
-        r.bcx.build.RetVoid();
+        let bcx = trans_fn_cleanups(r.bcx);
+        bcx.build.RetVoid();
     }
 
     // Step 3: Call iter passing [lliterbody, llenv], plus other args.
@@ -5439,6 +5448,7 @@ fn trans_ret(cx: &@block_ctxt, e: &option::t<@ast::expr>) -> result {
           parent_none. { more_cleanups = false; }
         }
     }
+    bcx = trans_fn_cleanups(bcx);
     bcx.build.RetVoid();
     ret rslt(new_sub_block_ctxt(bcx, "ret.unreachable"), C_nil());
 }
@@ -5600,6 +5610,18 @@ fn trans_block_cleanups(cx: &@block_ctxt, cleanup_cx: &@block_ctxt) ->
     ret bcx;
 }
 
+fn trans_fn_cleanups(bcx: &@block_ctxt) -> @block_ctxt {
+    alt bcx_fcx(bcx).llobstacktoken {
+        some(lltoken_) {
+            let lltoken = lltoken_; // satisfy alias checker
+            bcx.build.Call(bcx_ccx(bcx).upcalls.dynastack_free,
+                           ~[bcx_fcx(bcx).lltaskptr, lltoken]);
+        }
+        none. { /* nothing to do */ }
+    }
+    ret bcx;
+}
+
 iter block_locals(b: &ast::blk) -> @ast::local {
     // FIXME: putting from inside an iter block doesn't work, so we can't
     // use the index here.
@@ -6048,6 +6070,7 @@ fn trans_closure(bcx_maybe: &option::t<@block_ctxt>,
     if !is_terminated(bcx) {
         // FIXME: until LLVM has a unit type, we are moving around
         // C_nil values rather than their void type.
+        bcx = trans_fn_cleanups(bcx);
         bcx.build.RetVoid();
     }
 
@@ -6204,6 +6227,7 @@ fn trans_tag_variant(cx: @local_ctxt, tag_id: ast::node_id,
         i += 1u;
     }
     bcx = trans_block_cleanups(bcx, find_scope_cx(bcx));
+    bcx = trans_fn_cleanups(bcx);
     bcx.build.RetVoid();
     finish_fn(fcx, lltop);
 }

trunk/src/rt/rust_obstack.cpp

@@ -44,7 +44,7 @@ rust_obstack_chunk::free(void *ptr) {
     uint8_t *p = (uint8_t *)ptr;
     if (p < data || p >= data + size)
         return false;
-    assert(p < data + alen);
+    assert(p <= data + alen);
     alen = (size_t)(p - data);
     return true;
 }
@@ -71,7 +71,8 @@ rust_obstack::alloc(size_t len) {
     if (!chunk)
         return alloc_new(len);
     void *ptr = chunk->alloc(len);
-    return ptr ? ptr : alloc_new(len);
+    ptr = ptr ? ptr : alloc_new(len);
+    return ptr;
 }
 
 void