rebase backport of rust-lang#38855 onto beta

nikomatsakis · Jan 6, 2017 · 49f1804 · 49f1804
1 parent 6b6036c
commit 49f1804
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/librustc_trans/mir/block.rs b/src/librustc_trans/mir/block.rs
@@ -223,7 +223,7 @@ impl<'bcx, 'tcx> MirContext<'bcx, 'tcx> {
                 } else {
                     let op = self.trans_consume(&bcx, &mir::Lvalue::Local(mir::RETURN_POINTER));
                     if let Ref(llval) = op.val {
-                        base::load_ty(&bcx, llval, op.ty)
+                        bcx.with_block(|bcx| base::load_ty(&bcx, llval, op.ty))
                     } else {
                         op.pack_if_pair(&bcx).immediate()
                     }