[llvm] r235240 - DebugInfo: Remove DIDescriptor from the DebugInfo API
Duncan P. N. Exon Smith
dexonsmith at apple.com
Fri Apr 17 16:20:11 PDT 2015
Author: dexonsmith
Date: Fri Apr 17 18:20:10 2015
New Revision: 235240
URL: http://llvm.org/viewvc/llvm-project?rev=235240&view=rev
Log:
DebugInfo: Remove DIDescriptor from the DebugInfo API
Stop using `DIDescriptor` and its subclasses in the `DebugInfoFinder`
API, as well as the rest of the API hanging around in `DebugInfo.h`.
Modified:
llvm/trunk/include/llvm/IR/DebugInfo.h
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h
llvm/trunk/lib/CodeGen/LiveDebugVariables.h
llvm/trunk/lib/IR/DebugInfo.cpp
llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp
llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp
llvm/trunk/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp
Modified: llvm/trunk/include/llvm/IR/DebugInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/DebugInfo.h?rev=235240&r1=235239&r2=235240&view=diff
==============================================================================
--- llvm/trunk/include/llvm/IR/DebugInfo.h (original)
+++ llvm/trunk/include/llvm/IR/DebugInfo.h Fri Apr 17 18:20:10 2015
@@ -419,15 +419,15 @@ SIMPLIFY_DESCRIPTOR(DIImportedEntity)
#undef SIMPLIFY_DESCRIPTOR
/// \brief Find subprogram that is enclosing this scope.
-DISubprogram getDISubprogram(const MDNode *Scope);
+MDSubprogram *getDISubprogram(const MDNode *Scope);
/// \brief Find debug info for a given function.
/// \returns a valid DISubprogram, if found. Otherwise, it returns an empty
/// DISubprogram.
-DISubprogram getDISubprogram(const Function *F);
+MDSubprogram *getDISubprogram(const Function *F);
/// \brief Find underlying composite type.
-DICompositeType getDICompositeType(DIType T);
+MDCompositeTypeBase *getDICompositeType(MDType *T);
/// \brief Generate map by visiting all retained types.
DITypeIdentifierMap generateDITypeIdentifierMap(const NamedMDNode *CU_Nodes);
@@ -463,7 +463,7 @@ public:
/// \brief Process DbgValueInst.
void processValue(const Module &M, const DbgValueInst *DVI);
/// \brief Process DILocation.
- void processLocation(const Module &M, DILocation Loc);
+ void processLocation(const Module &M, const MDLocation *Loc);
/// \brief Clear all lists.
void reset();
@@ -471,22 +471,23 @@ public:
private:
void InitializeTypeMap(const Module &M);
- void processType(DIType DT);
- void processSubprogram(DISubprogram SP);
- void processScope(DIScope Scope);
- bool addCompileUnit(DICompileUnit CU);
- bool addGlobalVariable(DIGlobalVariable DIG);
- bool addSubprogram(DISubprogram SP);
- bool addType(DIType DT);
- bool addScope(DIScope Scope);
+ void processType(MDType *DT);
+ void processSubprogram(MDSubprogram *SP);
+ void processScope(MDScope *Scope);
+ bool addCompileUnit(MDCompileUnit *CU);
+ bool addGlobalVariable(MDGlobalVariable *DIG);
+ bool addSubprogram(MDSubprogram *SP);
+ bool addType(MDType *DT);
+ bool addScope(MDScope *Scope);
public:
- typedef SmallVectorImpl<DICompileUnit>::const_iterator compile_unit_iterator;
- typedef SmallVectorImpl<DISubprogram>::const_iterator subprogram_iterator;
- typedef SmallVectorImpl<DIGlobalVariable>::const_iterator
+ typedef SmallVectorImpl<MDCompileUnit *>::const_iterator
+ compile_unit_iterator;
+ typedef SmallVectorImpl<MDSubprogram *>::const_iterator subprogram_iterator;
+ typedef SmallVectorImpl<MDGlobalVariable *>::const_iterator
global_variable_iterator;
- typedef SmallVectorImpl<DIType>::const_iterator type_iterator;
- typedef SmallVectorImpl<DIScope>::const_iterator scope_iterator;
+ typedef SmallVectorImpl<MDType *>::const_iterator type_iterator;
+ typedef SmallVectorImpl<MDScope *>::const_iterator scope_iterator;
iterator_range<compile_unit_iterator> compile_units() const {
return iterator_range<compile_unit_iterator>(CUs.begin(), CUs.end());
@@ -515,19 +516,19 @@ public:
unsigned scope_count() const { return Scopes.size(); }
private:
- SmallVector<DICompileUnit, 8> CUs;
- SmallVector<DISubprogram, 8> SPs;
- SmallVector<DIGlobalVariable, 8> GVs;
- SmallVector<DIType, 8> TYs;
- SmallVector<DIScope, 8> Scopes;
- SmallPtrSet<MDNode *, 64> NodesSeen;
+ SmallVector<MDCompileUnit *, 8> CUs;
+ SmallVector<MDSubprogram *, 8> SPs;
+ SmallVector<MDGlobalVariable *, 8> GVs;
+ SmallVector<MDType *, 8> TYs;
+ SmallVector<MDScope *, 8> Scopes;
+ SmallPtrSet<const MDNode *, 64> NodesSeen;
DITypeIdentifierMap TypeIdentifierMap;
/// \brief Specify if TypeIdentifierMap is initialized.
bool TypeMapInitialized;
};
-DenseMap<const Function *, DISubprogram> makeSubprogramMap(const Module &M);
+DenseMap<const Function *, MDSubprogram *> makeSubprogramMap(const Module &M);
} // end namespace llvm
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h?rev=235240&r1=235239&r2=235240&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h Fri Apr 17 18:20:10 2015
@@ -321,7 +321,7 @@ class DwarfDebug : public AsmPrinterHand
DwarfAccelTable AccelNamespace;
DwarfAccelTable AccelTypes;
- DenseMap<const Function *, DISubprogram> FunctionDIs;
+ DenseMap<const Function *, MDSubprogram *> FunctionDIs;
MCDwarfDwoLineTable *getDwoLineTable(const DwarfCompileUnit &);
Modified: llvm/trunk/lib/CodeGen/LiveDebugVariables.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveDebugVariables.h?rev=235240&r1=235239&r2=235240&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/LiveDebugVariables.h (original)
+++ llvm/trunk/lib/CodeGen/LiveDebugVariables.h Fri Apr 17 18:20:10 2015
@@ -33,7 +33,8 @@ class VirtRegMap;
class LiveDebugVariables : public MachineFunctionPass {
void *pImpl;
- DenseMap<const Function*, DISubprogram> FunctionDIs;
+ DenseMap<const Function *, MDSubprogram *> FunctionDIs;
+
public:
static char ID; // Pass identification, replacement for typeid
Modified: llvm/trunk/lib/IR/DebugInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DebugInfo.cpp?rev=235240&r1=235239&r2=235240&view=diff
==============================================================================
--- llvm/trunk/lib/IR/DebugInfo.cpp (original)
+++ llvm/trunk/lib/IR/DebugInfo.cpp Fri Apr 17 18:20:10 2015
@@ -33,13 +33,13 @@
using namespace llvm;
using namespace llvm::dwarf;
-DISubprogram llvm::getDISubprogram(const MDNode *Scope) {
+MDSubprogram *llvm::getDISubprogram(const MDNode *Scope) {
if (auto *LocalScope = dyn_cast_or_null<MDLocalScope>(Scope))
return LocalScope->getSubprogram();
return nullptr;
}
-DISubprogram llvm::getDISubprogram(const Function *F) {
+MDSubprogram *llvm::getDISubprogram(const Function *F) {
// We look for the first instr that has a debug annotation leading back to F.
for (auto &BB : *F) {
auto Inst = std::find_if(BB.begin(), BB.end(), [](const Instruction &Inst) {
@@ -49,14 +49,14 @@ DISubprogram llvm::getDISubprogram(const
continue;
DebugLoc DLoc = Inst->getDebugLoc();
const MDNode *Scope = DLoc.getInlinedAtScope();
- DISubprogram Subprogram = getDISubprogram(Scope);
- return Subprogram->describes(F) ? Subprogram : DISubprogram();
+ auto *Subprogram = getDISubprogram(Scope);
+ return Subprogram->describes(F) ? Subprogram : nullptr;
}
- return DISubprogram();
+ return nullptr;
}
-DICompositeType llvm::getDICompositeType(DIType T) {
+MDCompositeTypeBase *llvm::getDICompositeType(MDType *T) {
if (auto *C = dyn_cast_or_null<MDCompositeTypeBase>(T))
return C;
@@ -123,9 +123,9 @@ void DebugInfoFinder::processModule(cons
InitializeTypeMap(M);
if (NamedMDNode *CU_Nodes = M.getNamedMetadata("llvm.dbg.cu")) {
for (unsigned i = 0, e = CU_Nodes->getNumOperands(); i != e; ++i) {
- DICompileUnit CU = cast<MDCompileUnit>(CU_Nodes->getOperand(i));
+ auto *CU = cast<MDCompileUnit>(CU_Nodes->getOperand(i));
addCompileUnit(CU);
- for (DIGlobalVariable DIG : CU->getGlobalVariables()) {
+ for (auto *DIG : CU->getGlobalVariables()) {
if (addGlobalVariable(DIG)) {
processScope(DIG->getScope());
processType(DIG->getType().resolve(TypeIdentifierMap));
@@ -137,7 +137,7 @@ void DebugInfoFinder::processModule(cons
processType(ET);
for (auto *RT : CU->getRetainedTypes())
processType(RT);
- for (DIImportedEntity Import : CU->getImportedEntities()) {
+ for (auto *Import : CU->getImportedEntities()) {
auto *Entity = Import->getEntity().resolve(TypeIdentifierMap);
if (auto *T = dyn_cast<MDType>(Entity))
processType(T);
@@ -150,7 +150,7 @@ void DebugInfoFinder::processModule(cons
}
}
-void DebugInfoFinder::processLocation(const Module &M, DILocation Loc) {
+void DebugInfoFinder::processLocation(const Module &M, const MDLocation *Loc) {
if (!Loc)
return;
InitializeTypeMap(M);
@@ -158,7 +158,7 @@ void DebugInfoFinder::processLocation(co
processLocation(M, Loc->getInlinedAt());
}
-void DebugInfoFinder::processType(DIType DT) {
+void DebugInfoFinder::processType(MDType *DT) {
if (!addType(DT))
return;
processScope(DT->getScope().resolve(TypeIdentifierMap));
@@ -172,7 +172,7 @@ void DebugInfoFinder::processType(DIType
for (Metadata *D : DCT->getElements()) {
if (auto *T = dyn_cast<MDType>(D))
processType(T);
- else if (DISubprogram SP = dyn_cast<MDSubprogram>(D))
+ else if (auto *SP = dyn_cast<MDSubprogram>(D))
processSubprogram(SP);
}
} else if (auto *DDT = dyn_cast<MDDerivedTypeBase>(DT)) {
@@ -180,18 +180,18 @@ void DebugInfoFinder::processType(DIType
}
}
-void DebugInfoFinder::processScope(DIScope Scope) {
+void DebugInfoFinder::processScope(MDScope *Scope) {
if (!Scope)
return;
- if (DIType Ty = dyn_cast<MDType>(Scope)) {
+ if (auto *Ty = dyn_cast<MDType>(Scope)) {
processType(Ty);
return;
}
- if (DICompileUnit CU = dyn_cast<MDCompileUnit>(Scope)) {
+ if (auto *CU = dyn_cast<MDCompileUnit>(Scope)) {
addCompileUnit(CU);
return;
}
- if (DISubprogram SP = dyn_cast<MDSubprogram>(Scope)) {
+ if (auto *SP = dyn_cast<MDSubprogram>(Scope)) {
processSubprogram(SP);
return;
}
@@ -204,7 +204,7 @@ void DebugInfoFinder::processScope(DISco
}
}
-void DebugInfoFinder::processSubprogram(DISubprogram SP) {
+void DebugInfoFinder::processSubprogram(MDSubprogram *SP) {
if (!addSubprogram(SP))
return;
processScope(SP->getScope().resolve(TypeIdentifierMap));
@@ -220,12 +220,12 @@ void DebugInfoFinder::processSubprogram(
void DebugInfoFinder::processDeclare(const Module &M,
const DbgDeclareInst *DDI) {
- MDNode *N = dyn_cast<MDNode>(DDI->getVariable());
+ auto *N = dyn_cast<MDNode>(DDI->getVariable());
if (!N)
return;
InitializeTypeMap(M);
- DIVariable DV = dyn_cast<MDLocalVariable>(N);
+ auto *DV = dyn_cast<MDLocalVariable>(N);
if (!DV)
return;
@@ -236,12 +236,12 @@ void DebugInfoFinder::processDeclare(con
}
void DebugInfoFinder::processValue(const Module &M, const DbgValueInst *DVI) {
- MDNode *N = dyn_cast<MDNode>(DVI->getVariable());
+ auto *N = dyn_cast<MDNode>(DVI->getVariable());
if (!N)
return;
InitializeTypeMap(M);
- DIVariable DV = dyn_cast<MDLocalVariable>(N);
+ auto *DV = dyn_cast<MDLocalVariable>(N);
if (!DV)
return;
@@ -251,18 +251,18 @@ void DebugInfoFinder::processValue(const
processType(DV->getType().resolve(TypeIdentifierMap));
}
-bool DebugInfoFinder::addType(DIType DT) {
+bool DebugInfoFinder::addType(MDType *DT) {
if (!DT)
return false;
if (!NodesSeen.insert(DT).second)
return false;
- TYs.push_back(DT);
+ TYs.push_back(const_cast<MDType *>(DT));
return true;
}
-bool DebugInfoFinder::addCompileUnit(DICompileUnit CU) {
+bool DebugInfoFinder::addCompileUnit(MDCompileUnit *CU) {
if (!CU)
return false;
if (!NodesSeen.insert(CU).second)
@@ -272,7 +272,7 @@ bool DebugInfoFinder::addCompileUnit(DIC
return true;
}
-bool DebugInfoFinder::addGlobalVariable(DIGlobalVariable DIG) {
+bool DebugInfoFinder::addGlobalVariable(MDGlobalVariable *DIG) {
if (!DIG)
return false;
@@ -283,7 +283,7 @@ bool DebugInfoFinder::addGlobalVariable(
return true;
}
-bool DebugInfoFinder::addSubprogram(DISubprogram SP) {
+bool DebugInfoFinder::addSubprogram(MDSubprogram *SP) {
if (!SP)
return false;
@@ -294,7 +294,7 @@ bool DebugInfoFinder::addSubprogram(DISu
return true;
}
-bool DebugInfoFinder::addScope(DIScope Scope) {
+bool DebugInfoFinder::addScope(MDScope *Scope) {
if (!Scope)
return false;
// FIXME: Ocaml binding generates a scope with no content, we treat it
@@ -369,17 +369,17 @@ unsigned llvm::getDebugMetadataVersionFr
return 0;
}
-llvm::DenseMap<const llvm::Function *, llvm::DISubprogram>
+DenseMap<const llvm::Function *, MDSubprogram *>
llvm::makeSubprogramMap(const Module &M) {
- DenseMap<const Function *, DISubprogram> R;
+ DenseMap<const Function *, MDSubprogram *> R;
NamedMDNode *CU_Nodes = M.getNamedMetadata("llvm.dbg.cu");
if (!CU_Nodes)
return R;
for (MDNode *N : CU_Nodes->operands()) {
- DICompileUnit CUNode = cast<MDCompileUnit>(N);
- for (DISubprogram SP : CUNode->getSubprograms()) {
+ auto *CUNode = cast<MDCompileUnit>(N);
+ for (auto *SP : CUNode->getSubprograms()) {
if (Function *F = SP->getFunction())
R.insert(std::make_pair(F, SP));
}
Modified: llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp?rev=235240&r1=235239&r2=235240&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp Fri Apr 17 18:20:10 2015
@@ -89,7 +89,7 @@ namespace {
bool doInitialization(CallGraph &CG) override;
/// The maximum number of elements to expand, or 0 for unlimited.
unsigned maxElements;
- DenseMap<const Function *, DISubprogram> FunctionDIs;
+ DenseMap<const Function *, MDSubprogram *> FunctionDIs;
};
}
Modified: llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp?rev=235240&r1=235239&r2=235240&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp Fri Apr 17 18:20:10 2015
@@ -127,7 +127,7 @@ namespace {
// As the code generation for module is finished (and DIBuilder is
// finalized) we assume that subprogram descriptors won't be changed, and
// they are stored in map for short duration anyway.
- DenseMap<const Function *, DISubprogram> FunctionDIs;
+ DenseMap<const Function *, MDSubprogram *> FunctionDIs;
protected:
// DAH uses this to specify a different ID.
Modified: llvm/trunk/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp?rev=235240&r1=235239&r2=235240&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp (original)
+++ llvm/trunk/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp Fri Apr 17 18:20:10 2015
@@ -248,7 +248,7 @@ class DataFlowSanitizer : public ModuleP
DFSanABIList ABIList;
DenseMap<Value *, Function *> UnwrappedFnMap;
AttributeSet ReadOnlyNoneAttrs;
- DenseMap<const Function *, DISubprogram> FunctionDIs;
+ DenseMap<const Function *, MDSubprogram *> FunctionDIs;
Value *getShadowAddress(Value *Addr, Instruction *Pos);
bool isInstrumented(const Function *F);
More information about the llvm-commits
mailing list