Remove reference to FAM in registerCallbacks and VerifyEach for TargetVerify in instrumentation

Author: jofrn

clang/lib/CodeGen/BackendUtil.cpp

@@ -917,7 +917,7 @@ void EmitAssemblyHelper::RunOptimizationPipeline(
       TheModule->getContext(),
       (CodeGenOpts.DebugPassManager || DebugPassStructure),
       CodeGenOpts.VerifyEach, PrintPassOpts);
-  SI.registerCallbacks(PIC, &MAM, &FAM);
+  SI.registerCallbacks(PIC, &MAM);
   PassBuilder PB(TM.get(), PTO, PGOOpt, &PIC);
 
   // Handle the assignment tracking feature options.

flang/lib/Frontend/FrontendActions.cpp

@@ -947,7 +947,7 @@ void CodeGenAction::runOptimizationPipeline(llvm::raw_pwrite_stream &os) {
 
   llvm::StandardInstrumentations si(llvmModule->getContext(),
                                     opts.DebugPassManager);
-  si.registerCallbacks(pic, &mam, &fam);
+  si.registerCallbacks(pic, &mam);
   if (ci.isTimingEnabled())
     si.getTimePasses().setOutStream(ci.getTimingStreamLLVM());
   pto.LoopUnrolling = opts.UnrollLoops;

llvm/examples/Kaleidoscope/Chapter4/toy.cpp

@@ -577,7 +577,7 @@ static void InitializeModuleAndManagers() {
   ThePIC = std::make_unique<PassInstrumentationCallbacks>();
   TheSI = std::make_unique<StandardInstrumentations>(*TheContext,
                                                      /*DebugLogging*/ true);
-  TheSI->registerCallbacks(*ThePIC, TheMAM.get(), TheFAM.get());
+  TheSI->registerCallbacks(*ThePIC, TheMAM.get());
 
   // Add transform passes.
   // Do simple "peephole" optimizations and bit-twiddling optzns.

llvm/examples/Kaleidoscope/Chapter5/toy.cpp

@@ -851,7 +851,7 @@ static void InitializeModuleAndManagers() {
   ThePIC = std::make_unique<PassInstrumentationCallbacks>();
   TheSI = std::make_unique<StandardInstrumentations>(*TheContext,
                                                      /*DebugLogging*/ true);
-  TheSI->registerCallbacks(*ThePIC, TheMAM.get(), TheFAM.get());
+  TheSI->registerCallbacks(*ThePIC, TheMAM.get());
 
   // Add transform passes.
   // Do simple "peephole" optimizations and bit-twiddling optzns.

llvm/examples/Kaleidoscope/Chapter6/toy.cpp

@@ -970,7 +970,7 @@ static void InitializeModuleAndManagers() {
   ThePIC = std::make_unique<PassInstrumentationCallbacks>();
   TheSI = std::make_unique<StandardInstrumentations>(*TheContext,
                                                      /*DebugLogging*/ true);
-  TheSI->registerCallbacks(*ThePIC, TheMAM.get(), TheFAM.get());
+  TheSI->registerCallbacks(*ThePIC, TheMAM.get());
 
   // Add transform passes.
   // Do simple "peephole" optimizations and bit-twiddling optzns.

llvm/examples/Kaleidoscope/Chapter7/toy.cpp

@@ -1139,7 +1139,7 @@ static void InitializeModuleAndManagers() {
   ThePIC = std::make_unique<PassInstrumentationCallbacks>();
   TheSI = std::make_unique<StandardInstrumentations>(*TheContext,
                                                      /*DebugLogging*/ true);
-  TheSI->registerCallbacks(*ThePIC, TheMAM.get(), TheFAM.get());
+  TheSI->registerCallbacks(*ThePIC, TheMAM.get());
 
   // Add transform passes.
   // Promote allocas to registers.

llvm/include/llvm/Passes/StandardInstrumentations.h

@@ -478,8 +478,7 @@ class VerifyInstrumentation {
 public:
   VerifyInstrumentation(bool DebugLogging) : DebugLogging(DebugLogging) {}
   LLVM_ABI void registerCallbacks(PassInstrumentationCallbacks &PIC,
-                         ModuleAnalysisManager *MAM,
-			 FunctionAnalysisManager *FAM);
+                         ModuleAnalysisManager *MAM);
 };
 
 /// This class implements --time-trace functionality for new pass manager.
@@ -625,8 +624,7 @@ class StandardInstrumentations {
   // Register all the standard instrumentation callbacks. If \p FAM is nullptr
   // then PreservedCFGChecker is not enabled.
   LLVM_ABI void registerCallbacks(PassInstrumentationCallbacks &PIC,
-                         ModuleAnalysisManager *MAM,
-			 FunctionAnalysisManager *FAM);
+                         ModuleAnalysisManager *MAM);
 
   TimePassesHandler &getTimePasses() { return TimePasses; }
 };

llvm/lib/LTO/LTOBackend.cpp

@@ -273,7 +273,7 @@ static void runNewPMPasses(const Config &Conf, Module &Mod, TargetMachine *TM,
   PassInstrumentationCallbacks PIC;
   StandardInstrumentations SI(Mod.getContext(), Conf.DebugPassManager,
                               Conf.VerifyEach);
-  SI.registerCallbacks(PIC, &MAM, &FAM);
+  SI.registerCallbacks(PIC, &MAM);
   PassBuilder PB(TM, Conf.PTO, PGOOpt, &PIC);
 
   RegisterPassPlugins(Conf.PassPlugins, PB);

llvm/lib/LTO/ThinLTOCodeGenerator.cpp

@@ -241,7 +241,7 @@ static void optimizeModule(Module &TheModule, TargetMachine &TM,
 
   PassInstrumentationCallbacks PIC;
   StandardInstrumentations SI(TheModule.getContext(), DebugPassManager);
-  SI.registerCallbacks(PIC, &MAM, &FAM);
+  SI.registerCallbacks(PIC, &MAM);
   PipelineTuningOptions PTO;
   PTO.LoopVectorization = true;
   PTO.SLPVectorization = true;

llvm/lib/Passes/PassBuilderBindings.cpp

@@ -76,7 +76,7 @@ static LLVMErrorRef runPasses(Module *Mod, Function *Fun, const char *Passes,
   PB.crossRegisterProxies(LAM, FAM, CGAM, MAM);
 
   StandardInstrumentations SI(Mod->getContext(), Debug, VerifyEach);
-  SI.registerCallbacks(PIC, &MAM, &FAM);
+  SI.registerCallbacks(PIC, &MAM);
 
   // Run the pipeline.
   if (Fun) {