From 8479989ebe30f8fb9e14fbd5622fe0fd51988ff6 Mon Sep 17 00:00:00 2001 From: Eric Christopher Date: Wed, 26 Jun 2013 22:44:57 +0000 Subject: [PATCH] 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/Target/NVPTX/NVPTXAsmPrinter.cpp | 2 +- lib/Transforms/Instrumentation/GCOVProfiling.cpp | 4 ++-- lib/Transforms/Utils/Local.cpp | 6 +++--- tools/opt/opt.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/Target/NVPTX/NVPTXAsmPrinter.cpp b/lib/Target/NVPTX/NVPTXAsmPrinter.cpp index 8ceddf3b8c8..ff739315657 100644 --- a/lib/Target/NVPTX/NVPTXAsmPrinter.cpp +++ b/lib/Target/NVPTX/NVPTXAsmPrinter.cpp @@ -279,7 +279,7 @@ void NVPTXAsmPrinter::emitLineNumberAsDotLoc(const MachineInstr &MI) { const LLVMContext &ctx = MF->getFunction()->getContext(); DIScope Scope(curLoc.getScope(ctx)); - if (!Scope.isScope()) + if (!Scope.Verify()) return; StringRef fileName(Scope.getFilename()); diff --git a/lib/Transforms/Instrumentation/GCOVProfiling.cpp b/lib/Transforms/Instrumentation/GCOVProfiling.cpp index fe3fe1c74a0..ef66bf8e11c 100644 --- a/lib/Transforms/Instrumentation/GCOVProfiling.cpp +++ b/lib/Transforms/Instrumentation/GCOVProfiling.cpp @@ -434,7 +434,7 @@ void GCOVProfiler::emitProfileNotes() { 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 @@ bool GCOVProfiler::emitProfileArcs() { SmallVector, 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; diff --git a/lib/Transforms/Utils/Local.cpp b/lib/Transforms/Utils/Local.cpp index 1878a54c9ac..12e5b3e9d2e 100644 --- a/lib/Transforms/Utils/Local.cpp +++ b/lib/Transforms/Utils/Local.cpp @@ -854,7 +854,7 @@ static bool LdStHasDebugValue(DIVariable &DIVar, Instruction *I) { 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, 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 @@ bool llvm::replaceDbgDeclareForAlloca(AllocaInst *AI, Value *NewAllocaAddress, 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 diff --git a/tools/opt/opt.cpp b/tools/opt/opt.cpp index 11508de9601..f642a78fc06 100644 --- a/tools/opt/opt.cpp +++ b/tools/opt/opt.cpp @@ -389,8 +389,8 @@ struct BreakpointPrinter : public ModulePass { for (unsigned i = 0, e = NMD->getNumOperands(); i != e; ++i) { std::string Name; DISubprogram SP(NMD->getOperand(i)); - assert(SP.isSubprogram()); - getContextName(SP.getContext(), Name); + if (SP.Verify()) + getContextName(SP.getContext(), Name); Name = Name + SP.getDisplayName().str(); if (!Name.empty() && Processed.insert(Name)) { Out << Name << "\n"; -- 2.34.1