Skip to content

Commit bebaab7

Browse files
committed
---
yaml --- r: 5588 b: refs/heads/master c: 16d5aaa h: refs/heads/master v: v3
1 parent c157dd0 commit bebaab7

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: e3626c940524c49d51d586b13375f64a52d44666
2+
refs/heads/master: 16d5aaa96217555f4cba76e03b60ca7d1aaad935

trunk/src/comp/middle/trans.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4676,8 +4676,6 @@ fn trans_be(cx: @block_ctxt, e: @ast::expr) : ast_util::is_call_expr(e) ->
46764676
fn init_local(bcx: @block_ctxt, local: @ast::local) -> @block_ctxt {
46774677
let ty = node_id_type(bcx_ccx(bcx), local.node.id);
46784678
let llptr = bcx.fcx.lllocals.get(local.node.id);
4679-
// Make a note to drop this slot on the way out.
4680-
add_clean(bcx, llptr, ty);
46814679

46824680
if must_zero(bcx_ccx(bcx), local) {
46834681
bcx = zero_alloca(bcx, llptr, ty);
@@ -4698,9 +4696,10 @@ fn init_local(bcx: @block_ctxt, local: @ast::local) -> @block_ctxt {
46984696
}
46994697
_ { }
47004698
}
4701-
bcx =
4702-
trans_alt::bind_irrefutable_pat(bcx, local.node.pat, llptr,
4703-
bcx.fcx.lllocals, false);
4699+
// Make a note to drop this slot on the way out.
4700+
add_clean(bcx, llptr, ty);
4701+
bcx = trans_alt::bind_irrefutable_pat(bcx, local.node.pat, llptr,
4702+
bcx.fcx.lllocals, false);
47044703
ret bcx;
47054704

47064705
fn must_zero(ccx: @crate_ctxt, local: @ast::local) -> bool {

0 commit comments

Comments
 (0)