Remove modifications to Lint/Verifier.

Author: jofrn

llvm/lib/Analysis/Lint.cpp

@@ -735,11 +735,9 @@ PreservedAnalyses LintPass::run(Function &F, FunctionAnalysisManager &AM) {
   Lint L(Mod, DL, AA, AC, DT, TLI);
   L.visit(F);
   dbgs() << L.MessagesStr.str();
-  if (AbortOnError && !L.MessagesStr.str().empty()) {
+  if (AbortOnError && !L.MessagesStr.str().empty())
     report_fatal_error(
         "linter found errors, aborting. (enabled by abort-on-error)", false);
-    return PreservedAnalyses::none();
-  }
   return PreservedAnalyses::all();
 }
 

llvm/lib/IR/Verifier.cpp

@@ -135,10 +135,6 @@ static cl::opt<bool> VerifyNoAliasScopeDomination(
     cl::desc("Ensure that llvm.experimental.noalias.scope.decl for identical "
              "scopes are not dominating"));
 
-static cl::opt<bool>
-    VerifyAbortOnError("verifier-abort-on-error", cl::init(false),
-                       cl::desc("In the Verifier pass, abort on errors."));
-
 namespace llvm {
 
 struct VerifierSupport {
@@ -7869,24 +7865,16 @@ VerifierAnalysis::Result VerifierAnalysis::run(Function &F,
 
 PreservedAnalyses VerifierPass::run(Module &M, ModuleAnalysisManager &AM) {
   auto Res = AM.getResult<VerifierAnalysis>(M);
-  if (Res.IRBroken || Res.DebugInfoBroken) {
-    //M.IsValid = false;
-    if (VerifyAbortOnError && FatalErrors)
-      report_fatal_error("Broken module found, compilation aborted!");
-    return PreservedAnalyses::none();
-  }
+  if (FatalErrors && (Res.IRBroken || Res.DebugInfoBroken))
+    report_fatal_error("Broken module found, compilation aborted!");
 
   return PreservedAnalyses::all();
 }
 
 PreservedAnalyses VerifierPass::run(Function &F, FunctionAnalysisManager &AM) {
   auto res = AM.getResult<VerifierAnalysis>(F);
-  if (res.IRBroken) {
-    //F.getParent()->IsValid = false;
-    if (VerifyAbortOnError && FatalErrors)
-      report_fatal_error("Broken function found, compilation aborted!");
-    return PreservedAnalyses::none();
-  }
+  if (res.IRBroken && FatalErrors)
+    report_fatal_error("Broken function found, compilation aborted!");
 
   return PreservedAnalyses::all();
 }