diff options
| author | Amanieu d'Antras <amanieu@gmail.com> | 2020-03-20 11:09:32 +0000 |
|---|---|---|
| committer | Amanieu d'Antras <amanieu@gmail.com> | 2020-04-29 01:05:55 +0100 |
| commit | 2f5bd9d0f1f1f572b519f5e4ec6220dc85f03822 (patch) | |
| tree | f0286eacc3507434dd4e26e80326e55788c81765 | |
| parent | 6470169237833d02c399568a375d9b47cbfaeccc (diff) | |
| download | rust-2f5bd9d0f1f1f572b519f5e4ec6220dc85f03822.tar.gz rust-2f5bd9d0f1f1f572b519f5e4ec6220dc85f03822.zip | |
Remove -Z no-landing-pads flag
| -rw-r--r-- | src/librustc_interface/tests.rs | 1 | ||||
| -rw-r--r-- | src/librustc_session/options.rs | 2 | ||||
| -rw-r--r-- | src/librustc_session/session.rs | 2 | ||||
| -rw-r--r-- | src/test/mir-opt/generator-tiny.rs | 2 | ||||
| -rw-r--r-- | src/test/run-fail/mir_codegen_no_landing_pads.rs | 2 | ||||
| -rw-r--r-- | src/test/run-fail/mir_codegen_no_landing_pads_diverging.rs | 2 |
6 files changed, 4 insertions, 7 deletions
diff --git a/src/librustc_interface/tests.rs b/src/librustc_interface/tests.rs index cee2e5b5bec..0b3ba73f86a 100644 --- a/src/librustc_interface/tests.rs +++ b/src/librustc_interface/tests.rs @@ -546,7 +546,6 @@ fn test_debugging_options_tracking_hash() { tracked!(new_llvm_pass_manager, true); tracked!(no_codegen, true); tracked!(no_generate_arange_section, true); - tracked!(no_landing_pads, true); tracked!(no_link, true); tracked!(no_profiler_runtime, true); tracked!(osx_rpath_install_name, true); diff --git a/src/librustc_session/options.rs b/src/librustc_session/options.rs index 5b983d1105d..be78d46b981 100644 --- a/src/librustc_session/options.rs +++ b/src/librustc_session/options.rs @@ -878,8 +878,6 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options, "omit DWARF address ranges that give faster lookups"), no_interleave_lints: bool = (false, parse_no_flag, [UNTRACKED], "execute lints separately; allows benchmarking individual lints"), - no_landing_pads: bool = (false, parse_no_flag, [TRACKED], - "omit landing pads for unwinding"), no_leak_check: bool = (false, parse_no_flag, [UNTRACKED], "disable the 'leak check' for subtyping; unsound, but useful for tests"), no_link: bool = (false, parse_no_flag, [TRACKED], diff --git a/src/librustc_session/session.rs b/src/librustc_session/session.rs index 42f9a8d6b05..56e5a0b3d50 100644 --- a/src/librustc_session/session.rs +++ b/src/librustc_session/session.rs @@ -541,7 +541,7 @@ impl Session { } pub fn no_landing_pads(&self) -> bool { - self.opts.debugging_opts.no_landing_pads || self.panic_strategy() == PanicStrategy::Abort + self.panic_strategy() == PanicStrategy::Abort } pub fn unstable_options(&self) -> bool { self.opts.debugging_opts.unstable_options diff --git a/src/test/mir-opt/generator-tiny.rs b/src/test/mir-opt/generator-tiny.rs index b537263dd1b..80a34395ef1 100644 --- a/src/test/mir-opt/generator-tiny.rs +++ b/src/test/mir-opt/generator-tiny.rs @@ -1,7 +1,7 @@ //! Tests that generators that cannot return or unwind don't have unnecessary //! panic branches. -// compile-flags: -Zno-landing-pads +// compile-flags: -C panic=abort #![feature(generators, generator_trait)] diff --git a/src/test/run-fail/mir_codegen_no_landing_pads.rs b/src/test/run-fail/mir_codegen_no_landing_pads.rs index f3384dc45f3..bf850573cf8 100644 --- a/src/test/run-fail/mir_codegen_no_landing_pads.rs +++ b/src/test/run-fail/mir_codegen_no_landing_pads.rs @@ -1,4 +1,4 @@ -// compile-flags: -Z no-landing-pads -C codegen-units=1 +// compile-flags: -C panic=abort -C codegen-units=1 // error-pattern:converging_fn called // ignore-cloudabi no std::process diff --git a/src/test/run-fail/mir_codegen_no_landing_pads_diverging.rs b/src/test/run-fail/mir_codegen_no_landing_pads_diverging.rs index 08f6d578bb2..04cf33b8a12 100644 --- a/src/test/run-fail/mir_codegen_no_landing_pads_diverging.rs +++ b/src/test/run-fail/mir_codegen_no_landing_pads_diverging.rs @@ -1,4 +1,4 @@ -// compile-flags: -Z no-landing-pads -C codegen-units=1 +// compile-flags: -C panic=abort -C codegen-units=1 // error-pattern:diverging_fn called // ignore-cloudabi no std::process |