From f431df0d7f4f56e5c4c6a73023126e1b02104436 Mon Sep 17 00:00:00 2001 From: Axel Cohen Date: Mon, 20 Dec 2021 14:50:03 +0100 Subject: Load new pass manager plugins only if the new pm is actually used --- compiler/rustc_codegen_llvm/src/llvm_util.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'compiler/rustc_codegen_llvm/src') diff --git a/compiler/rustc_codegen_llvm/src/llvm_util.rs b/compiler/rustc_codegen_llvm/src/llvm_util.rs index 53571e8cb32..863a347e121 100644 --- a/compiler/rustc_codegen_llvm/src/llvm_util.rs +++ b/compiler/rustc_codegen_llvm/src/llvm_util.rs @@ -119,11 +119,11 @@ unsafe fn configure_llvm(sess: &Session) { llvm::LLVMInitializePasses(); - let use_new_llvm_pm_plugin_register = - sess.opts.debugging_opts.new_llvm_pass_manager.unwrap_or(false); - - // Use the legacy pm registration if the new_llvm_pass_manager option isn't explicitly enabled - if !use_new_llvm_pm_plugin_register { + // Use the legacy plugin registration if we don't use the new pass manager + if !should_use_new_llvm_pass_manager( + &sess.opts.debugging_opts.new_llvm_pass_manager, + &sess.target.arch, + ) { // Register LLVM plugins by loading them into the compiler process. for plugin in &sess.opts.debugging_opts.llvm_plugins { let lib = Library::new(plugin).unwrap_or_else(|e| bug!("couldn't load plugin: {}", e)); -- cgit 1.4.1-3-g733a5