From c4f29fa0ed738b52e7d8ef372c2d09300755dfef Mon Sep 17 00:00:00 2001 From: Axel Cohen Date: Wed, 24 Nov 2021 11:43:40 +0100 Subject: Use the existing llvm-plugins option for both legacy and new pm registration --- compiler/rustc_codegen_llvm/src/back/write.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'compiler/rustc_codegen_llvm/src/back') diff --git a/compiler/rustc_codegen_llvm/src/back/write.rs b/compiler/rustc_codegen_llvm/src/back/write.rs index a28fca3e700..146c0996b8c 100644 --- a/compiler/rustc_codegen_llvm/src/back/write.rs +++ b/compiler/rustc_codegen_llvm/src/back/write.rs @@ -470,7 +470,7 @@ pub(crate) unsafe fn optimize_with_new_llvm_pass_manager( let extra_passes = config.passes.join(","); - let pass_plugins = config.pass_plugins.join(" "); + let llvm_plugins = config.llvm_plugins.join(","); // FIXME: NewPM doesn't provide a facility to pass custom InlineParams. // We would have to add upstream support for this first, before we can support @@ -501,8 +501,8 @@ pub(crate) unsafe fn optimize_with_new_llvm_pass_manager( selfprofile_after_pass_callback, extra_passes.as_ptr().cast(), extra_passes.len(), - pass_plugins.as_ptr().cast(), - pass_plugins.len(), + llvm_plugins.as_ptr().cast(), + llvm_plugins.len(), ); result.into_result().map_err(|()| llvm_err(diag_handler, "failed to run LLVM passes")) } -- cgit 1.4.1-3-g733a5