diff options
| author | Mark Simulacrum <mark.simulacrum@gmail.com> | 2017-01-04 11:47:43 -0700 |
|---|---|---|
| committer | Mark Simulacrum <mark.simulacrum@gmail.com> | 2017-01-04 11:47:43 -0700 |
| commit | b01b6e1d5664a1ebaf0e9264be5dddbbc8b4996b (patch) | |
| tree | b8f62eb424b11df7d0a2a5d4f581e75440afe142 /src | |
| parent | 21f86ba1bc4c58706973c88a81d0b2e51190c0b7 (diff) | |
Fix errors introduced during rebase
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc_trans/intrinsic.rs | 2 | ||||
| -rw-r--r-- | src/librustc_trans/mir/block.rs | 4 | ||||
| -rw-r--r-- | src/librustc_trans/mir/mod.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc_trans/intrinsic.rs b/src/librustc_trans/intrinsic.rs index 9429a84e231..842a21e98db 100644 --- a/src/librustc_trans/intrinsic.rs +++ b/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 --git a/src/librustc_trans/mir/block.rs b/src/librustc_trans/mir/block.rs index c7fdee90e99..6d92cd99fbe 100644 --- a/src/librustc_trans/mir/block.rs +++ b/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 --git a/src/librustc_trans/mir/mod.rs b/src/librustc_trans/mir/mod.rs index 824ee5b3c36..eedd7956805 100644 --- a/src/librustc_trans/mir/mod.rs +++ b/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 { |