diff options
| author | Björn Steinbrink <bsteinbr@gmail.com> | 2015-03-02 12:11:46 +0100 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-03-02 21:35:40 +0530 |
| commit | fe91974dd6eb3c16cc80081d6eb9f7017eb6bada (patch) | |
| tree | e58d1ad5557dd55242ea3ef16a86a43cbf0f1e17 | |
| parent | 1cc8b6ec664f30b43f75551e95299d943c8a4e6a (diff) | |
| download | rust-fe91974dd6eb3c16cc80081d6eb9f7017eb6bada.tar.gz rust-fe91974dd6eb3c16cc80081d6eb9f7017eb6bada.zip | |
Properly propagate block changes while translating drop glue
| -rw-r--r-- | src/librustc_trans/trans/glue.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/librustc_trans/trans/glue.rs b/src/librustc_trans/trans/glue.rs index 9491c8377a6..1151b11d21f 100644 --- a/src/librustc_trans/trans/glue.rs +++ b/src/librustc_trans/trans/glue.rs @@ -313,8 +313,7 @@ fn trans_struct_drop<'blk, 'tcx>(bcx: Block<'blk, 'tcx>, ty::mk_nil(bcx.tcx())); let (_, variant_cx) = invoke(variant_cx, dtor_addr, &args[..], dtor_ty, DebugLoc::None); - variant_cx.fcx.pop_and_trans_custom_cleanup_scope(variant_cx, field_scope); - variant_cx + variant_cx.fcx.pop_and_trans_custom_cleanup_scope(variant_cx, field_scope) }) } |