diff options
| author | bors <bors@rust-lang.org> | 2020-04-30 07:04:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-30 07:04:43 +0000 |
| commit | bf459752d41a93eb6df0e9513de4ef807883a80c (patch) | |
| tree | 6a6e05a05077a1f72fcf055196b69be3eb341b6a /src/librustc_codegen_ssa | |
| parent | 7c8dbd969dd0ef2af6d8bab9e03ba7ce6cac41a2 (diff) | |
| parent | c6817ffb2cadae7f80414e13d99e89ec83db9a77 (diff) | |
| download | rust-bf459752d41a93eb6df0e9513de4ef807883a80c.tar.gz rust-bf459752d41a93eb6df0e9513de4ef807883a80c.zip | |
Auto merge of #70175 - Amanieu:remove_nlp, r=pnkfelix
Remove -Z no-landing-pads flag Since #67502, `-Z no-landing-pads` will cause all attempted unwinds to abort since we don't generate a `try` / `catch`. This previously worked because `__rust_try` was located in libpanic_unwind which is always compiled with `-C panic=unwind`, but `__rust_try` is now directly inline into the crate that uses `catch_unwind`. As such, `-Z no-landing-pads` is now mostly useless and people should use `-C panic=abort` instead.
Diffstat (limited to 'src/librustc_codegen_ssa')
| -rw-r--r-- | src/librustc_codegen_ssa/back/write.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_codegen_ssa/back/write.rs b/src/librustc_codegen_ssa/back/write.rs index 5b105dff80b..094c57b2401 100644 --- a/src/librustc_codegen_ssa/back/write.rs +++ b/src/librustc_codegen_ssa/back/write.rs @@ -35,7 +35,7 @@ use rustc_session::Session; use rustc_span::hygiene::ExpnId; use rustc_span::source_map::SourceMap; use rustc_span::symbol::{sym, Symbol}; -use rustc_target::spec::MergeFunctions; +use rustc_target::spec::{MergeFunctions, PanicStrategy}; use std::any::Any; use std::fs; @@ -995,7 +995,7 @@ fn start_executing_work<B: ExtraBackendMethods>( crate_types: sess.crate_types.borrow().clone(), each_linked_rlib_for_lto, lto: sess.lto(), - no_landing_pads: sess.no_landing_pads(), + no_landing_pads: sess.panic_strategy() == PanicStrategy::Abort, fewer_names: sess.fewer_names(), save_temps: sess.opts.cg.save_temps, opts: Arc::new(sess.opts.clone()), |