Pass Module Analysis Manager to Standard Instrumentations

Author: Aleksei Romanov

compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp

@@ -732,12 +732,7 @@ extern "C" LLVMRustResult LLVMRustOptimize(
 PTO.SLPVectorization = SLPVectorize;
 PTO.MergeFunctions = MergeFunctions;
 
-// FIXME: We may want to expose this as an option.
-bool DebugPassManager = false;
-
  PassInstrumentationCallbacks PIC;
- StandardInstrumentations SI(TheModule->getContext(), DebugPassManager);
-SI.registerCallbacks(PIC);
 
 if (LlvmSelfProfiler) {
 LLVMSelfProfileInitializeCallbacks(PIC, LlvmSelfProfiler,
@@ -784,6 +779,12 @@ extern "C" LLVMRustResult LLVMRustOptimize(
  CGSCCAnalysisManager CGAM;
  ModuleAnalysisManager MAM;
 
+// FIXME: We may want to expose this as an option.
+bool DebugPassManager = false;
+
+ StandardInstrumentations SI(TheModule->getContext(), DebugPassManager);
+SI.registerCallbacks(PIC, &MAM);
+
 if (LLVMPluginsLen) {
 auto PluginsStr = StringRef(LLVMPlugins, LLVMPluginsLen);
  SmallVector<StringRef> Plugins;