From 19b4986b80c92dfdf55af1320c888dbc3bde8d5a Mon Sep 17 00:00:00 2001 From: Manman Ren Date: Sat, 20 Jul 2013 00:38:46 +0000 Subject: [PATCH] Debug Info Verifier: simplify DIxxx::Verify Simplify DIxxx:Verify to not call Verify on an operand. Instead, we use DebugInfoFinder to list all MDNodes that should be a DIScope and all MDNodes that should be a DIType and we will call Verify on those lists. llvm-svn: 186737 --- llvm/include/llvm/DebugInfo.h | 6 ++++++ llvm/lib/IR/DebugInfo.cpp | 42 ++++++++++++++---------------------------- llvm/lib/IR/Verifier.cpp | 3 +++ 3 files changed, 23 insertions(+), 28 deletions(-) diff --git a/llvm/include/llvm/DebugInfo.h b/llvm/include/llvm/DebugInfo.h index 2a00ab0..5c74b17 100644 --- a/llvm/include/llvm/DebugInfo.h +++ b/llvm/include/llvm/DebugInfo.h @@ -768,6 +768,8 @@ namespace llvm { /// addType - Add type into Tys. bool addType(DIType DT); + bool addScope(DIScope Scope); + public: typedef SmallVectorImpl::const_iterator iterator; iterator compile_unit_begin() const { return CUs.begin(); } @@ -778,17 +780,21 @@ namespace llvm { iterator global_variable_end() const { return GVs.end(); } iterator type_begin() const { return TYs.begin(); } iterator type_end() const { return TYs.end(); } + iterator scope_begin() const { return Scopes.begin(); } + iterator scope_end() const { return Scopes.end(); } unsigned compile_unit_count() const { return CUs.size(); } unsigned global_variable_count() const { return GVs.size(); } unsigned subprogram_count() const { return SPs.size(); } unsigned type_count() const { return TYs.size(); } + unsigned scope_count() const { return Scopes.size(); } private: SmallVector CUs; // Compile Units SmallVector SPs; // Subprograms SmallVector GVs; // Global Variables; SmallVector TYs; // Types + SmallVector Scopes; // Scopes SmallPtrSet NodesSeen; }; } // end namespace llvm diff --git a/llvm/lib/IR/DebugInfo.cpp b/llvm/lib/IR/DebugInfo.cpp index 19de781..f6ffc03 100644 --- a/llvm/lib/IR/DebugInfo.cpp +++ b/llvm/lib/IR/DebugInfo.cpp @@ -436,9 +436,6 @@ bool DIObjCProperty::Verify() const { if (!isObjCProperty()) return false; - DIType Ty = getType(); - if (!Ty.Verify()) return false; - // Don't worry about the rest of the strings for now. return DbgNode->getNumOperands() == 8; } @@ -447,8 +444,6 @@ bool DIObjCProperty::Verify() const { bool DIType::Verify() const { if (!isType()) return false; - if (getContext() && !getContext().Verify()) - return false; unsigned Tag = getTag(); if (!isBasicType() && Tag != dwarf::DW_TAG_const_type && Tag != dwarf::DW_TAG_volatile_type && Tag != dwarf::DW_TAG_pointer_type && @@ -481,8 +476,6 @@ bool DIDerivedType::Verify() const { bool DICompositeType::Verify() const { if (!isCompositeType()) return false; - if (getContext() && !getContext().Verify()) - return false; return DbgNode->getNumOperands() >= 10 && DbgNode->getNumOperands() <= 14; } @@ -492,12 +485,6 @@ bool DISubprogram::Verify() const { if (!isSubprogram()) return false; - if (getContext() && !getContext().Verify()) - return false; - - DICompositeType Ty = getType(); - if (!Ty.Verify()) - return false; return DbgNode->getNumOperands() == 20; } @@ -509,13 +496,6 @@ bool DIGlobalVariable::Verify() const { if (getDisplayName().empty()) return false; - if (getContext() && !getContext().Verify()) - return false; - - DIType Ty = getType(); - if (!Ty.Verify()) - return false; - return DbgNode->getNumOperands() == 13; } @@ -524,13 +504,6 @@ bool DIVariable::Verify() const { if (!isVariable()) return false; - if (getContext() && !getContext().Verify()) - return false; - - DIType Ty = getType(); - if (!Ty.Verify()) - return false; - return DbgNode->getNumOperands() >= 8; } @@ -883,8 +856,10 @@ void DebugInfoFinder::processModule(const Module &M) { DIArray GVs = CU.getGlobalVariables(); for (unsigned i = 0, e = GVs.getNumElements(); i != e; ++i) { DIGlobalVariable DIG(GVs.getElement(i)); - if (addGlobalVariable(DIG)) + if (addGlobalVariable(DIG)) { + addScope(DIG.getContext()); processType(DIG.getType()); + } } DIArray SPs = CU.getSubprograms(); for (unsigned i = 0, e = SPs.getNumElements(); i != e; ++i) @@ -922,6 +897,7 @@ void DebugInfoFinder::processLocation(DILocation Loc) { void DebugInfoFinder::processType(DIType DT) { if (!addType(DT)) return; + addScope(DT.getContext()); if (DT.isCompositeType()) { DICompositeType DCT(DT); processType(DCT.getTypeDerivedFrom()); @@ -956,6 +932,7 @@ void DebugInfoFinder::processLexicalBlock(DILexicalBlock LB) { void DebugInfoFinder::processSubprogram(DISubprogram SP) { if (!addSubprogram(SP)) return; + addScope(SP.getContext()); processType(SP.getType()); } @@ -1021,6 +998,15 @@ bool DebugInfoFinder::addSubprogram(DISubprogram SP) { return true; } +bool DebugInfoFinder::addScope(DIScope Scope) { + if (!Scope) + return false; + if (!NodesSeen.insert(Scope)) + return false; + Scopes.push_back(Scope); + return true; +} + //===----------------------------------------------------------------------===// // DIDescriptor: dump routines for all descriptors. //===----------------------------------------------------------------------===// diff --git a/llvm/lib/IR/Verifier.cpp b/llvm/lib/IR/Verifier.cpp index 1d495b7..38fc7e3 100644 --- a/llvm/lib/IR/Verifier.cpp +++ b/llvm/lib/IR/Verifier.cpp @@ -2214,6 +2214,9 @@ void Verifier::verifyDebugInfo(Module &M) { for (DebugInfoFinder::iterator I = Finder.type_begin(), E = Finder.type_end(); I != E; ++I) Assert1(DIType(*I).Verify(), "DIType does not Verify!", *I); + for (DebugInfoFinder::iterator I = Finder.scope_begin(), + E = Finder.scope_end(); I != E; ++I) + Assert1(DIScope(*I).Verify(), "DIScope does not Verify!", *I); } } -- 2.7.4