rebase backport of #38855 onto beta

nikomatsakis · nikomatsakis · commit 49f1804c5828 · 2017-01-06T13:49:02.000-05:00
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()
                     }

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ impl<'bcx, 'tcx> MirContext<'bcx, 'tcx> {`
`223`	`223`	`} else {`
`224`	`224`	`let op = self.trans_consume(&bcx, &mir::Lvalue::Local(mir::RETURN_POINTER));`
`225`	`225`	`if let Ref(llval) = op.val {`
`226`		`- base::load_ty(&bcx, llval, op.ty)`
	`226`	`+ bcx.with_block(\|bcx\| base::load_ty(&bcx, llval, op.ty))`
`227`	`227`	`} else {`
`228`	`228`	`op.pack_if_pair(&bcx).immediate()`
`229`	`229`	`}`