diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-03-02 16:54:01 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-03-03 01:46:29 +0530 |
| commit | c9d54946403f42a1a771ed2649b80996c49bb6b3 (patch) | |
| tree | d33f3aa1f5e3c27c0d29342fce5adb047e5a344d | |
| parent | 718b591f33ab23adb0beca8fffceeb9b89a603e2 (diff) | |
| parent | fe91974dd6eb3c16cc80081d6eb9f7017eb6bada (diff) | |
| download | rust-c9d54946403f42a1a771ed2649b80996c49bb6b3.tar.gz rust-c9d54946403f42a1a771ed2649b80996c49bb6b3.zip | |
Rollup merge of #22961 - dotdash:branch_drop, r=eddyb
| -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) }) } |