Skip to content

Commit 2f5bd9d

Browse files
committed
Remove -Z no-landing-pads flag
1 parent 6470169 commit 2f5bd9d

File tree

6 files changed

+4
-7
lines changed

6 files changed

+4
-7
lines changed

src/librustc_interface/tests.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,6 @@ fn test_debugging_options_tracking_hash() {
546546
tracked!(new_llvm_pass_manager, true);
547547
tracked!(no_codegen, true);
548548
tracked!(no_generate_arange_section, true);
549-
tracked!(no_landing_pads, true);
550549
tracked!(no_link, true);
551550
tracked!(no_profiler_runtime, true);
552551
tracked!(osx_rpath_install_name, true);

src/librustc_session/options.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -878,8 +878,6 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options,
878878
"omit DWARF address ranges that give faster lookups"),
879879
no_interleave_lints: bool = (false, parse_no_flag, [UNTRACKED],
880880
"execute lints separately; allows benchmarking individual lints"),
881-
no_landing_pads: bool = (false, parse_no_flag, [TRACKED],
882-
"omit landing pads for unwinding"),
883881
no_leak_check: bool = (false, parse_no_flag, [UNTRACKED],
884882
"disable the 'leak check' for subtyping; unsound, but useful for tests"),
885883
no_link: bool = (false, parse_no_flag, [TRACKED],

src/librustc_session/session.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ impl Session {
541541
}
542542

543543
pub fn no_landing_pads(&self) -> bool {
544-
self.opts.debugging_opts.no_landing_pads || self.panic_strategy() == PanicStrategy::Abort
544+
self.panic_strategy() == PanicStrategy::Abort
545545
}
546546
pub fn unstable_options(&self) -> bool {
547547
self.opts.debugging_opts.unstable_options

src/test/mir-opt/generator-tiny.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! Tests that generators that cannot return or unwind don't have unnecessary
22
//! panic branches.
33
4-
// compile-flags: -Zno-landing-pads
4+
// compile-flags: -C panic=abort
55

66
#![feature(generators, generator_trait)]
77

src/test/run-fail/mir_codegen_no_landing_pads.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// compile-flags: -Z no-landing-pads -C codegen-units=1
1+
// compile-flags: -C panic=abort -C codegen-units=1
22
// error-pattern:converging_fn called
33
// ignore-cloudabi no std::process
44

src/test/run-fail/mir_codegen_no_landing_pads_diverging.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// compile-flags: -Z no-landing-pads -C codegen-units=1
1+
// compile-flags: -C panic=abort -C codegen-units=1
22
// error-pattern:diverging_fn called
33
// ignore-cloudabi no std::process
44

0 commit comments

Comments
 (0)