Skip to content

Commit 8f83dd8

Browse files
committed
---
yaml --- r: 52673 b: refs/heads/dist-snap c: 97c593a h: refs/heads/master i: 52671: 0a1de25 v: v3
1 parent 6be8900 commit 8f83dd8

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
99
refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
10-
refs/heads/dist-snap: 1b613ff9fcec4b4468de76779ccd37c7281e09b5
10+
refs/heads/dist-snap: 97c593a1ced524bf5182a1821946b7a528442da0
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1313
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/middle/trans/base.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ fn malloc_raw_dyn(bcx: block,
305305

306306
// Allocate space:
307307
let tydesc = PointerCast(bcx, static_ti.tydesc, T_ptr(T_i8()));
308-
let rval = alloca_zeroed(bcx, T_ptr(T_i8()));
308+
let rval = alloca(bcx, T_ptr(T_i8()));
309309
let bcx = callee::trans_rtcall_or_lang_call(
310310
bcx,
311311
langcall,
@@ -1504,10 +1504,6 @@ fn alloca(cx: block, t: TypeRef) -> ValueRef {
15041504
alloca_maybe_zeroed(cx, t, false)
15051505
}
15061506

1507-
fn alloca_zeroed(cx: block, t: TypeRef) -> ValueRef {
1508-
alloca_maybe_zeroed(cx, t, true)
1509-
}
1510-
15111507
fn alloca_maybe_zeroed(cx: block, t: TypeRef, zero: bool) -> ValueRef {
15121508
let _icx = cx.insn_ctxt("alloca");
15131509
if cx.unreachable {

branches/dist-snap/src/librustc/middle/trans/closure.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ fn make_opaque_cbox_take_glue(
525525

526526
// Allocate memory, update original ptr, and copy existing data
527527
let opaque_tydesc = PointerCast(bcx, tydesc, T_ptr(T_i8()));
528-
let rval = alloca_zeroed(bcx, T_ptr(T_i8()));
528+
let rval = alloca(bcx, T_ptr(T_i8()));
529529
let bcx = callee::trans_rtcall_or_lang_call(
530530
bcx,
531531
bcx.tcx().lang_items.exchange_malloc_fn(),

branches/dist-snap/src/librustc/middle/trans/glue.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ pub fn free_ty_immediate(bcx: block, v: ValueRef, t: ty::t) -> block {
134134
ty::ty_evec(_, ty::vstore_box) |
135135
ty::ty_estr(ty::vstore_box) |
136136
ty::ty_opaque_closure_ptr(_) => {
137-
let vp = alloca_zeroed(bcx, type_of(bcx.ccx(), t));
137+
let vp = alloca(bcx, type_of(bcx.ccx(), t));
138138
Store(bcx, v, vp);
139139
free_ty(bcx, vp, t)
140140
}

0 commit comments

Comments
 (0)