---

yaml
---
r: 42791
b: refs/heads/try
c: 97c593a
h: refs/heads/master
i:
  42789: 437e318
  42787: 85a4e6c
  42783: 6f72e55
v: v3

Author: pcwalton

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
-refs/heads/try: 1b613ff9fcec4b4468de76779ccd37c7281e09b5
+refs/heads/try: 97c593a1ced524bf5182a1821946b7a528442da0
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/librustc/middle/trans/base.rs

@@ -305,7 +305,7 @@ fn malloc_raw_dyn(bcx: block,
 
     // Allocate space:
     let tydesc = PointerCast(bcx, static_ti.tydesc, T_ptr(T_i8()));
-    let rval = alloca_zeroed(bcx, T_ptr(T_i8()));
+    let rval = alloca(bcx, T_ptr(T_i8()));
     let bcx = callee::trans_rtcall_or_lang_call(
         bcx,
         langcall,
@@ -1504,10 +1504,6 @@ fn alloca(cx: block, t: TypeRef) -> ValueRef {
     alloca_maybe_zeroed(cx, t, false)
 }
 
-fn alloca_zeroed(cx: block, t: TypeRef) -> ValueRef {
-    alloca_maybe_zeroed(cx, t, true)
-}
-
 fn alloca_maybe_zeroed(cx: block, t: TypeRef, zero: bool) -> ValueRef {
     let _icx = cx.insn_ctxt("alloca");
     if cx.unreachable {

branches/try/src/librustc/middle/trans/closure.rs

@@ -525,7 +525,7 @@ fn make_opaque_cbox_take_glue(
 
         // Allocate memory, update original ptr, and copy existing data
         let opaque_tydesc = PointerCast(bcx, tydesc, T_ptr(T_i8()));
-        let rval = alloca_zeroed(bcx, T_ptr(T_i8()));
+        let rval = alloca(bcx, T_ptr(T_i8()));
         let bcx = callee::trans_rtcall_or_lang_call(
             bcx,
             bcx.tcx().lang_items.exchange_malloc_fn(),

branches/try/src/librustc/middle/trans/glue.rs

@@ -134,7 +134,7 @@ pub fn free_ty_immediate(bcx: block, v: ValueRef, t: ty::t) -> block {
       ty::ty_evec(_, ty::vstore_box) |
       ty::ty_estr(ty::vstore_box) |
       ty::ty_opaque_closure_ptr(_) => {
-        let vp = alloca_zeroed(bcx, type_of(bcx.ccx(), t));
+        let vp = alloca(bcx, type_of(bcx.ccx(), t));
         Store(bcx, v, vp);
         free_ty(bcx, vp, t)
       }