diff options
| author | Amanieu d'Antras <amanieu@gmail.com> | 2020-01-27 06:10:10 +0000 |
|---|---|---|
| committer | Amanieu d'Antras <amanieu@gmail.com> | 2020-03-05 17:36:50 +0000 |
| commit | f4f91f0b2f98ddf9ea36c4bc200ebda2cd898230 (patch) | |
| tree | 97d2e63867c5bb5a636c4eb96f79576d625e88f7 /src/librustc_codegen_ssa/mir | |
| parent | d73813ae62a2d7327f1e657f999ea7636c7a402d (diff) | |
| download | rust-f4f91f0b2f98ddf9ea36c4bc200ebda2cd898230.tar.gz rust-f4f91f0b2f98ddf9ea36c4bc200ebda2cd898230.zip | |
Remove eh_unwind_resume lang item
Diffstat (limited to 'src/librustc_codegen_ssa/mir')
| -rw-r--r-- | src/librustc_codegen_ssa/mir/block.rs | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/librustc_codegen_ssa/mir/block.rs b/src/librustc_codegen_ssa/mir/block.rs index a1b54607b80..2cf0cceb910 100644 --- a/src/librustc_codegen_ssa/mir/block.rs +++ b/src/librustc_codegen_ssa/mir/block.rs @@ -178,15 +178,10 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> { let lp1 = bx.load_operand(lp1).immediate(); slot.storage_dead(&mut bx); - if !bx.sess().target.target.options.custom_unwind_resume { - let mut lp = bx.const_undef(self.landing_pad_type()); - lp = bx.insert_value(lp, lp0, 0); - lp = bx.insert_value(lp, lp1, 1); - bx.resume(lp); - } else { - bx.call(bx.eh_unwind_resume(), &[lp0], helper.funclet(self)); - bx.unreachable(); - } + let mut lp = bx.const_undef(self.landing_pad_type()); + lp = bx.insert_value(lp, lp0, 0); + lp = bx.insert_value(lp, lp1, 1); + bx.resume(lp); } } |