Fix errors introduced during rebase

Author: Mark-Simulacrum

Diff for: src/librustc_trans/intrinsic.rs

@@ -694,7 +694,7 @@ fn try_intrinsic<'a, 'tcx>(
         bcx.call(func, &[data], None);
         bcx.store(C_null(Type::i8p(&bcx.ccx)), dest, None);
     } else if wants_msvc_seh(bcx.sess()) {
-        trans_msvc_try(bcx, fcx, func, data, local_ptr, dest);
+        trans_msvc_try(bcx, ccx, func, data, local_ptr, dest);
     } else {
         trans_gnu_try(bcx, ccx, func, data, local_ptr, dest);
     }

Diff for: src/librustc_trans/mir/block.rs

@@ -209,7 +209,7 @@ impl<'a, 'tcx> MirContext<'a, 'tcx> {
                     };
                     let llslot = match op.val {
                         Immediate(_) | Pair(..) => {
-                            let llscratch = bcx.fcx().alloca(ret.original_ty, "ret");
+                            let llscratch = bcx.alloca(ret.original_ty, "ret");
                             self.store_operand(&bcx, llscratch, op, None);
                             llscratch
                         }
@@ -651,7 +651,7 @@ impl<'a, 'tcx> MirContext<'a, 'tcx> {
         let (mut llval, by_ref) = match op.val {
             Immediate(_) | Pair(..) => {
                 if arg.is_indirect() || arg.cast.is_some() {
-                    let llscratch = bcx.fcx().alloca(arg.original_ty, "arg");
+                    let llscratch = bcx.alloca(arg.original_ty, "arg");
                     self.store_operand(bcx, llscratch, op, None);
                     (llscratch, true)
                 } else {

Diff for: src/librustc_trans/mir/mod.rs

@@ -519,7 +519,7 @@ fn arg_local_refs<'a, 'tcx>(bcx: &Builder<'a, 'tcx>,
             // doesn't actually strip the offset when splitting the closure
             // environment into its components so it ends up out of bounds.
             let env_ptr = if !env_ref {
-                let alloc = bcx.fcx().alloca(common::val_ty(llval), "__debuginfo_env_ptr");
+                let alloc = bcx.alloca(common::val_ty(llval), "__debuginfo_env_ptr");
                 bcx.store(llval, alloc, None);
                 alloc
             } else {