Skip to content

Commit 38e0e8f

Browse files
committed
Remove -Znew-llvm-pass-manager
1 parent 2860f77 commit 38e0e8f

File tree

8 files changed

+3
-13
lines changed

8 files changed

+3
-13
lines changed

compiler/rustc_codegen_llvm/src/back/write.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -513,10 +513,6 @@ pub(crate) unsafe fn maybe_optimize(
513513
let module_name = module.name.clone();
514514
let module_name = Some(&module_name[..]);
515515

516-
if let Some(false) = config.new_llvm_pass_manager {
517-
diag_handler.warn("ignoring `-Z new-llvm-pass-manager=no`, which is no longer supported");
518-
}
519-
520516
if config.emit_no_opt_bc {
521517
let out = cgcx.output_filenames.temp_path_ext("no-opt.bc", module_name);
522518
let out = path_to_c_string(&out);

compiler/rustc_codegen_ssa/src/back/write.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ pub struct ModuleConfig {
113113
pub vectorize_slp: bool,
114114
pub merge_functions: bool,
115115
pub inline_threshold: Option<u32>,
116-
pub new_llvm_pass_manager: Option<bool>,
117116
pub emit_lifetime_markers: bool,
118117
pub llvm_plugins: Vec<String>,
119118
}
@@ -265,7 +264,6 @@ impl ModuleConfig {
265264
},
266265

267266
inline_threshold: sess.opts.cg.inline_threshold,
268-
new_llvm_pass_manager: sess.opts.unstable_opts.new_llvm_pass_manager,
269267
emit_lifetime_markers: sess.emit_lifetime_markers(),
270268
llvm_plugins: if_regular!(sess.opts.unstable_opts.llvm_plugins.clone(), vec![]),
271269
}

compiler/rustc_interface/src/tests.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -758,7 +758,6 @@ fn test_unstable_options_tracking_hash() {
758758
tracked!(mir_opt_level, Some(4));
759759
tracked!(move_size_limit, Some(4096));
760760
tracked!(mutable_noalias, Some(true));
761-
tracked!(new_llvm_pass_manager, Some(true));
762761
tracked!(no_generate_arange_section, true);
763762
tracked!(no_link, true);
764763
tracked!(no_unique_section_names, true);

compiler/rustc_session/src/options.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1409,8 +1409,6 @@ options! {
14091409
"the size at which the `large_assignments` lint starts to be emitted"),
14101410
mutable_noalias: Option<bool> = (None, parse_opt_bool, [TRACKED],
14111411
"emit noalias metadata for mutable references (default: yes)"),
1412-
new_llvm_pass_manager: Option<bool> = (None, parse_opt_bool, [TRACKED],
1413-
"use new LLVM pass manager (default: no)"),
14141412
nll_facts: bool = (false, parse_bool, [UNTRACKED],
14151413
"dump facts from NLL analysis into side files (default: no)"),
14161414
nll_facts_dir: String = ("nll-facts".to_string(), parse_string, [UNTRACKED],

src/doc/unstable-book/src/compiler-flags/self-profile-events.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ $ rustc -Zself-profile -Zself-profile-events=default,args
4141

4242
- `llvm`
4343
- Adds tracing information about LLVM passes and codegeneration.
44-
- Disabled by default because this only works when `-Znew-llvm-pass-manager` is enabled.
44+
- Disabled by default for historical reasons.
4545

4646
## Event synonyms
4747

src/test/rustdoc-ui/z-help.stdout

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282
-Z mir-opt-level=val -- MIR optimization level (0-4; default: 1 in non optimized builds and 2 in optimized builds)
8383
-Z move-size-limit=val -- the size at which the `large_assignments` lint starts to be emitted
8484
-Z mutable-noalias=val -- emit noalias metadata for mutable references (default: yes)
85-
-Z new-llvm-pass-manager=val -- use new LLVM pass manager (default: no)
8685
-Z nll-facts=val -- dump facts from NLL analysis into side files (default: no)
8786
-Z nll-facts-dir=val -- the directory the NLL facts are dumped into (default: `nll-facts`)
8887
-Z no-analysis=val -- parse and expand the source, but run no analysis
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// build-fail
2-
// compile-flags: -Cpasses=unknown-pass -Z new-llvm-pass-manager=yes
2+
// compile-flags: -Cpasses=unknown-pass
33

44
fn main() {}

src/test/ui/sanitize/new-llvm-pass-manager-thin-lto.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88
// no-prefer-dynamic
99
// revisions: opt0 opt1
10-
// compile-flags: -Znew-llvm-pass-manager=yes -Zsanitizer=address -Clto=thin
10+
// compile-flags: -Zsanitizer=address -Clto=thin
1111
//[opt0]compile-flags: -Copt-level=0
1212
//[opt1]compile-flags: -Copt-level=1
1313
// run-fail

0 commit comments

Comments
 (0)