Revert Add debug location verification for !llvm.loop attachments.

This reverts r363725 (git commit 8ff822d61dacf5a9466755eedafd3eeb54abc00d)

llvm-svn: 363728

1 files changed, 26 insertions, 34 deletions

diff --git a/llvm/lib/IR/Verifier.cpp b/llvm/lib/IR/Verifier.cpp
index a1b53272784..10bac6df3a5 100644
--- a/llvm/lib/IR/Verifier.cpp
+++ b/llvm/lib/IR/Verifier.cpp
@@ -2342,44 +2342,36 @@ void Verifier::visitFunction(const Function &F) {
   // FIXME: Check this incrementally while visiting !dbg attachments.
   // FIXME: Only check when N is the canonical subprogram for F.
   SmallPtrSet<const MDNode *, 32> Seen;
-  auto VisitDebugLoc = [&](const Instruction &I, const MDNode *Node) {
-    // Be careful about using DILocation here since we might be dealing with
-    // broken code (this is the Verifier after all).
-    const DILocation *DL = dyn_cast_or_null<DILocation>(Node);
-    if (!DL)
-      return;
-    if (!Seen.insert(DL).second)
-      return;
+  for (auto &BB : F)
+    for (auto &I : BB) {
+      // Be careful about using DILocation here since we might be dealing with
+      // broken code (this is the Verifier after all).
+      DILocation *DL =
+          dyn_cast_or_null<DILocation>(I.getDebugLoc().getAsMDNode());
+      if (!DL)
+        continue;
+      if (!Seen.insert(DL).second)
+        continue;
 
-    Metadata *Parent = DL->getRawScope();
-    AssertDI(Parent && isa<DILocalScope>(Parent),
-             "DILocation's scope must be a DILocalScope", N, &F, &I, DL,
-             Parent);
-    DILocalScope *Scope = DL->getInlinedAtScope();
-    if (Scope && !Seen.insert(Scope).second)
-      return;
+      Metadata *Parent = DL->getRawScope();
+      AssertDI(Parent && isa<DILocalScope>(Parent),
+               "DILocation's scope must be a DILocalScope", N, &F, &I, DL,
+               Parent);
+      DILocalScope *Scope = DL->getInlinedAtScope();
+      if (Scope && !Seen.insert(Scope).second)
+        continue;
 
-    DISubprogram *SP = Scope ? Scope->getSubprogram() : nullptr;
+      DISubprogram *SP = Scope ? Scope->getSubprogram() : nullptr;
 
-    // Scope and SP could be the same MDNode and we don't want to skip
-    // validation in that case
-    if (SP && ((Scope != SP) && !Seen.insert(SP).second))
-      return;
+      // Scope and SP could be the same MDNode and we don't want to skip
+      // validation in that case
+      if (SP && ((Scope != SP) && !Seen.insert(SP).second))
+        continue;
 
-    // FIXME: Once N is canonical, check "SP == &N".
-    AssertDI(SP->describes(&F),
-             "!dbg attachment points at wrong subprogram for function", N, &F,
-             &I, DL, Scope, SP);
-  };
-  for (auto &BB : F)
-    for (auto &I : BB) {
-      VisitDebugLoc(I, I.getDebugLoc().getAsMDNode());
-      // The llvm.loop annotations also contain two DILocations.
-      if (auto MD = I.getMetadata(LLVMContext::MD_loop))
-        for (unsigned i = 1; i < MD->getNumOperands(); ++i)
-          VisitDebugLoc(I, dyn_cast_or_null<MDNode>(MD->getOperand(i)));
-      if (BrokenDebugInfo)
-        return;
+      // FIXME: Once N is canonical, check "SP == &N".
+      AssertDI(SP->describes(&F),
+               "!dbg attachment points at wrong subprogram for function", N, &F,
+               &I, DL, Scope, SP);
     }
 }