fix to register analysis pass from llvm plugin

rust-lang · Oct 6, 2023 · 5048f81 · 5048f81
1 parent d4ba2b4
commit 5048f81
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp
@@ -795,6 +795,20 @@ LLVMRustOptimize(
  CGSCCAnalysisManager CGAM;
  ModuleAnalysisManager MAM;
 
+ if (LLVMPluginsLen) {
+ auto PluginsStr = StringRef(LLVMPlugins, LLVMPluginsLen);
+ SmallVector<StringRef> Plugins;
+ PluginsStr.split(Plugins, ',', -1, false);
+ for (auto PluginPath: Plugins) {
+ auto Plugin = PassPlugin::Load(PluginPath.str());
+ if (!Plugin) {
+ LLVMRustSetLastError(("Failed to load pass plugin" + PluginPath.str()).c_str());
+ return LLVMRustResult::Failure;
+ }
+ Plugin->registerPassBuilderCallbacks(PB);
+ }
+ }
+
  FAM.registerPass([&] { return PB.buildDefaultAAPipeline(); });
 
  Triple TargetTriple(TheModule->getTargetTriple());
@@ -918,20 +932,6 @@ LLVMRustOptimize(
  }
  }
 
- if (LLVMPluginsLen) {
- auto PluginsStr = StringRef(LLVMPlugins, LLVMPluginsLen);
- SmallVector<StringRef> Plugins;
- PluginsStr.split(Plugins, ',', -1, false);
- for (auto PluginPath: Plugins) {
- auto Plugin = PassPlugin::Load(PluginPath.str());
- if (!Plugin) {
- LLVMRustSetLastError(("Failed to load pass plugin" + PluginPath.str()).c_str());
- return LLVMRustResult::Failure;
- }
- Plugin->registerPassBuilderCallbacks(PB);
- }
- }
-
  ModulePassManager MPM;
  bool NeedThinLTOBufferPasses = UseThinLTOBuffers;
  if (!NoPrepopulatePasses) {