commit 8479989ebe30f8fb9e14fbd5622fe0fd51988ff6
author Eric Christopher <echristo@gmail.com> Wed Jun 26 22:44:57 2013 +0000
committer Eric Christopher <echristo@gmail.com> Wed Jun 26 22:44:57 2013 +0000
tree d58e3bf5f9df7599e4866263f580679dba8367d4
parent b0a9ffaeb0cb3802da3611b95d3ea7f49f03f787

Revert "Debug Info: clean up usage of Verify." as it's breaking bots.

This reverts commit r185020

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

lib/Transforms/Instrumentation/GCOVProfiling.cpp

diff --git a/lib/Transforms/Instrumentation/GCOVProfiling.cpp b/lib/Transforms/Instrumentation/GCOVProfiling.cpp
index fe3fe1c..ef66bf8 100644
--- a/lib/Transforms/Instrumentation/GCOVProfiling.cpp
+++ b/lib/Transforms/Instrumentation/GCOVProfiling.cpp
@@ -434,7 +434,7 @@
     DIArray SPs = CU.getSubprograms();
     for (unsigned i = 0, e = SPs.getNumElements(); i != e; ++i) {
       DISubprogram SP(SPs.getElement(i));
-      assert(SP.isSubprogram());
+      if (!SP.Verify()) continue;
 
       Function *F = SP.getFunction();
       if (!F) continue;
@@ -483,7 +483,7 @@
     SmallVector<std::pair<GlobalVariable *, MDNode *>, 8> CountersBySP;
     for (unsigned i = 0, e = SPs.getNumElements(); i != e; ++i) {
       DISubprogram SP(SPs.getElement(i));
-      assert(SP.isSubprogram());
+      if (!SP.Verify()) continue;
       Function *F = SP.getFunction();
       if (!F) continue;
       if (!Result) Result = true;

lib/Transforms/Utils/Local.cpp

diff --git a/lib/Transforms/Utils/Local.cpp b/lib/Transforms/Utils/Local.cpp
index 1878a54..12e5b3e 100644
--- a/lib/Transforms/Utils/Local.cpp
+++ b/lib/Transforms/Utils/Local.cpp
@@ -854,7 +854,7 @@
 bool llvm::ConvertDebugDeclareToDebugValue(DbgDeclareInst *DDI,
                                            StoreInst *SI, DIBuilder &Builder) {
   DIVariable DIVar(DDI->getVariable());
-  if (!DIVar.isVariable())
+  if (!DIVar.Verify())
     return false;
 
   if (LdStHasDebugValue(DIVar, SI))
@@ -888,7 +888,7 @@
 bool llvm::ConvertDebugDeclareToDebugValue(DbgDeclareInst *DDI,
                                            LoadInst *LI, DIBuilder &Builder) {
   DIVariable DIVar(DDI->getVariable());
-  if (!DIVar.isVariable())
+  if (!DIVar.Verify())
     return false;
 
   if (LdStHasDebugValue(DIVar, LI))
@@ -961,7 +961,7 @@
   if (!DDI)
     return false;
   DIVariable DIVar(DDI->getVariable());
-  if (!DIVar.isVariable())
+  if (!DIVar.Verify())
     return false;
 
   // Create a copy of the original DIDescriptor for user variable, appending