CodePreparation needs unlisted passes invalidated

Author: Meinersbur

polly/include/polly/CodePreparation.h

@@ -26,9 +26,6 @@ struct CodePreparationPass final : llvm::PassInfoMixin<CodePreparationPass> {
   llvm::PreservedAnalyses run(llvm::Function &F,
                               llvm::FunctionAnalysisManager &FAM);
 };
-
-bool runCodePreparation(llvm::Function &F, llvm::DominatorTree *DT,
-                        llvm::LoopInfo *LI, llvm::RegionInfo *RI);
 } // namespace polly
 
 #endif /* POLLY_CODEPREPARATION_H */

polly/lib/Pass/PhaseManager.cpp

@@ -73,10 +73,14 @@ class PhaseManager {
     bool ModifiedIR = false;
 
     // Phase: prepare
-    // TODO: Setting ModifiedIR will invalidate any anlysis, even if DT, LI are
+    // TODO: Setting ModifiedIR will invalidate any analysis, even if DT, LI are
     // preserved.
-    if (Opts.isPhaseEnabled(PassPhase::Prepare))
-      ModifiedIR |= runCodePreparation(F, &DT, &LI, nullptr);
+    if (Opts.isPhaseEnabled(PassPhase::Prepare)) {
+      PreservedAnalyses PA = CodePreparationPass().run(F, FAM);
+      FAM.invalidate(F, PA);
+      if (!PA.areAllPreserved())
+        ModifiedIR = true;
+    }
 
     // Can't do anything without detection
     if (!Opts.isPhaseEnabled(PassPhase::Detection))

polly/lib/Transform/CodePreparation.cpp

@@ -58,8 +58,3 @@ PreservedAnalyses CodePreparationPass::run(Function &F,
   PA.preserve<LoopAnalysis>();
   return PA;
 }
-
-bool polly::runCodePreparation(Function &F, DominatorTree *DT, LoopInfo *LI,
-                               RegionInfo *RI) {
-  return runCodePreprationImpl(F, DT, LI, RI);
-}