From: Adrian Prantl <aprantl@apple.com>
Date: Thu, 28 Mar 2019 18:34:34 +0000 (+0000)
Subject: Temporarily revert "SafepointIRVerifier port to new Pass Manager"
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=99f3ad037d95f6f7df6d075913d66d33f4569fca;p=llvm

Temporarily revert "SafepointIRVerifier port to new Pass Manager"
to unbreak the modular bots and its follow-up commit.

This reverts commit https://reviews.llvm.org/D59825
because it introduced a

fatal error: cyclic dependency in module 'LLVM_intrinsic_gen': LLVM_intrinsic_gen -> LLVM_IR -> LLVM_intrinsic_gen

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@357201 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/IR/SafepointIRVerifier.h b/include/llvm/IR/SafepointIRVerifier.h
index ec5527954ad..cbdb8bd4256 100644
--- a/include/llvm/IR/SafepointIRVerifier.h
+++ b/include/llvm/IR/SafepointIRVerifier.h
@@ -18,8 +18,6 @@
 #ifndef LLVM_IR_SAFEPOINT_IR_VERIFIER
 #define LLVM_IR_SAFEPOINT_IR_VERIFIER
 
-#include "llvm/IR/PassManager.h"
-
 namespace llvm {
 
 class Function;
@@ -31,16 +29,6 @@ void verifySafepointIR(Function &F);
 /// Create an instance of the safepoint verifier pass which can be added to
 /// a pass pipeline to check for relocation bugs.
 FunctionPass *createSafepointIRVerifierPass();
-
-/// Create an instance of the safepoint verifier pass which can be added to
-/// a pass pipeline to check for relocation bugs.
-class SafepointIRVerifierPass : public PassInfoMixin<SafepointIRVerifierPass> {
-
-public:
-  explicit SafepointIRVerifierPass() {}
-
-  PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
-};
 }
 
 #endif // LLVM_IR_SAFEPOINT_IR_VERIFIER
diff --git a/lib/IR/SafepointIRVerifier.cpp b/lib/IR/SafepointIRVerifier.cpp
index 7f3dea5e6a6..217f10e864d 100644
--- a/lib/IR/SafepointIRVerifier.cpp
+++ b/lib/IR/SafepointIRVerifier.cpp
@@ -197,17 +197,6 @@ protected:
 static void Verify(const Function &F, const DominatorTree &DT,
                    const CFGDeadness &CD);
 
-namespace llvm {
-PreservedAnalyses SafepointIRVerifierPass::run(Function &F,
-                                               FunctionAnalysisManager &AM) {
-  const auto &DT = AM.getResult<DominatorTreeAnalysis>(F);
-  CFGDeadness CD;
-  CD.processFunction(F, DT);
-  Verify(F, DT, CD);
-  return PreservedAnalyses::all();
-}
-}
-
 namespace {
 
 struct SafepointIRVerifier : public FunctionPass {
diff --git a/lib/Passes/PassBuilder.cpp b/lib/Passes/PassBuilder.cpp
index a36956e121c..ba0d6c2bd68 100644
--- a/lib/Passes/PassBuilder.cpp
+++ b/lib/Passes/PassBuilder.cpp
@@ -56,7 +56,6 @@
 #include "llvm/IR/Dominators.h"
 #include "llvm/IR/IRPrintingPasses.h"
 #include "llvm/IR/PassManager.h"
-#include "llvm/IR/SafepointIRVerifier.h"
 #include "llvm/IR/Verifier.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/FormatVariadic.h"
diff --git a/lib/Passes/PassRegistry.def b/lib/Passes/PassRegistry.def
index 518b10dc5d5..2bf5222a385 100644
--- a/lib/Passes/PassRegistry.def
+++ b/lib/Passes/PassRegistry.def
@@ -231,7 +231,6 @@ FUNCTION_PASS("verify<domtree>", DominatorTreeVerifierPass())
 FUNCTION_PASS("verify<loops>", LoopVerifierPass())
 FUNCTION_PASS("verify<memoryssa>", MemorySSAVerifierPass())
 FUNCTION_PASS("verify<regions>", RegionInfoVerifierPass())
-FUNCTION_PASS("verify<safepoint-ir>", SafepointIRVerifierPass())
 FUNCTION_PASS("view-cfg", CFGViewerPass())
 FUNCTION_PASS("view-cfg-only", CFGOnlyViewerPass())
 FUNCTION_PASS("transform-warning", WarnMissedTransformationsPass())