maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Add another MDNode into DebugLocTuple. This will be used to keep track of inlined functions. 

llvm-svn: 83190
This commit is contained in:
Devang Patel 2009-10-01 01:15:28 +00:00
parent 4dbca6dfd4
commit 34986f12e6
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
llvm/include/llvm/Support/DebugLoc.h
View File

@ -25,17 +25,19 @@ namespace llvm {
/// ///
struct DebugLocTuple { struct DebugLocTuple {
MDNode *CompileUnit; MDNode *CompileUnit;
MDNode *InlinedLoc;
unsigned Line, Col; unsigned Line, Col;
DebugLocTuple() DebugLocTuple()
: CompileUnit(0), Line(~0U), Col(~0U) {}; : CompileUnit(0), InlinedLoc(0), Line(~0U), Col(~0U) {};
DebugLocTuple(MDNode *n, unsigned l, unsigned c) DebugLocTuple(MDNode *n, MDNode *i, unsigned l, unsigned c)
: CompileUnit(n), Line(l), Col(c) {}; : CompileUnit(n), InlinedLoc(i), Line(l), Col(c) {};
bool operator==(const DebugLocTuple &DLT) const { bool operator==(const DebugLocTuple &DLT) const {
return CompileUnit == DLT.CompileUnit && return CompileUnit == DLT.CompileUnit &&
Line == DLT.Line && Col == DLT.Col; InlinedLoc == DLT.InlinedLoc &&
Line == DLT.Line && Col == DLT.Col;
} }
bool operator!=(const DebugLocTuple &DLT) const { bool operator!=(const DebugLocTuple &DLT) const {
return !(*this == DLT); return !(*this == DLT);
@ -66,18 +68,20 @@ namespace llvm {
// Specialize DenseMapInfo for DebugLocTuple. // Specialize DenseMapInfo for DebugLocTuple.
template<> struct DenseMapInfo<DebugLocTuple> { template<> struct DenseMapInfo<DebugLocTuple> {
static inline DebugLocTuple getEmptyKey() { static inline DebugLocTuple getEmptyKey() {
return DebugLocTuple(0, ~0U, ~0U); return DebugLocTuple(0, 0, ~0U, ~0U);
} }
static inline DebugLocTuple getTombstoneKey() { static inline DebugLocTuple getTombstoneKey() {
return DebugLocTuple((MDNode*)~1U, ~1U, ~1U); return DebugLocTuple((MDNode*)~1U, (MDNode*)~1U, ~1U, ~1U);
} }
static unsigned getHashValue(const DebugLocTuple &Val) { static unsigned getHashValue(const DebugLocTuple &Val) {
return DenseMapInfo<MDNode*>::getHashValue(Val.CompileUnit) ^ return DenseMapInfo<MDNode*>::getHashValue(Val.CompileUnit) ^
DenseMapInfo<MDNode*>::getHashValue(Val.InlinedLoc) ^
DenseMapInfo<unsigned>::getHashValue(Val.Line) ^ DenseMapInfo<unsigned>::getHashValue(Val.Line) ^
DenseMapInfo<unsigned>::getHashValue(Val.Col); DenseMapInfo<unsigned>::getHashValue(Val.Col);
} }
static bool isEqual(const DebugLocTuple &LHS, const DebugLocTuple &RHS) { static bool isEqual(const DebugLocTuple &LHS, const DebugLocTuple &RHS) {
return LHS.CompileUnit == RHS.CompileUnit && return LHS.CompileUnit == RHS.CompileUnit &&
LHS.InlinedLoc == RHS.InlinedLoc &&
LHS.Line == RHS.Line && LHS.Line == RHS.Line &&
LHS.Col == RHS.Col; LHS.Col == RHS.Col;
} }

11
llvm/lib/Analysis/DebugInfo.cpp
View File

@ -952,7 +952,6 @@ void DIFactory::InsertDeclare(Value *Storage, DIVariable D, BasicBlock *BB) {
/// processModule - Process entire module and collect debug info. /// processModule - Process entire module and collect debug info.
void DebugInfoFinder::processModule(Module &M) { void DebugInfoFinder::processModule(Module &M) {
for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I) for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I)
for (Function::iterator FI = (*I).begin(), FE = (*I).end(); FI != FE; ++FI) for (Function::iterator FI = (*I).begin(), FE = (*I).end(); FI != FE; ++FI)
for (BasicBlock::iterator BI = (*FI).begin(), BE = (*FI).end(); BI != BE; for (BasicBlock::iterator BI = (*FI).begin(), BE = (*FI).end(); BI != BE;
@ -1271,7 +1270,7 @@ bool getLocationInfo(const Value *V, std::string &DisplayName,
Value *Context = SPI.getContext(); Value *Context = SPI.getContext();
// If this location is already tracked then use it. // If this location is already tracked then use it.
DebugLocTuple Tuple(cast<MDNode>(Context), SPI.getLine(), DebugLocTuple Tuple(cast<MDNode>(Context), NULL, SPI.getLine(),
SPI.getColumn()); SPI.getColumn());
DenseMap<DebugLocTuple, unsigned>::iterator II DenseMap<DebugLocTuple, unsigned>::iterator II
= DebugLocInfo.DebugIdMap.find(Tuple); = DebugLocInfo.DebugIdMap.find(Tuple);
@ -1292,9 +1291,11 @@ bool getLocationInfo(const Value *V, std::string &DisplayName,
DebugLocTracker &DebugLocInfo) { DebugLocTracker &DebugLocInfo) {
DebugLoc DL; DebugLoc DL;
MDNode *Context = Loc.getScope().getNode(); MDNode *Context = Loc.getScope().getNode();
MDNode *InlinedLoc = NULL;
if (!Loc.getOrigLocation().isNull())
InlinedLoc = Loc.getOrigLocation().getNode();
// If this location is already tracked then use it. // If this location is already tracked then use it.
DebugLocTuple Tuple(Context, Loc.getLineNumber(), DebugLocTuple Tuple(Context, InlinedLoc, Loc.getLineNumber(),
Loc.getColumnNumber()); Loc.getColumnNumber());
DenseMap<DebugLocTuple, unsigned>::iterator II DenseMap<DebugLocTuple, unsigned>::iterator II
= DebugLocInfo.DebugIdMap.find(Tuple); = DebugLocInfo.DebugIdMap.find(Tuple);
@ -1321,7 +1322,7 @@ bool getLocationInfo(const Value *V, std::string &DisplayName,
DICompileUnit CU(Subprogram.getCompileUnit()); DICompileUnit CU(Subprogram.getCompileUnit());
// If this location is already tracked then use it. // If this location is already tracked then use it.
DebugLocTuple Tuple(CU.getNode(), Line, /* Column */ 0); DebugLocTuple Tuple(CU.getNode(), NULL, Line, /* Column */ 0);
DenseMap<DebugLocTuple, unsigned>::iterator II DenseMap<DebugLocTuple, unsigned>::iterator II
= DebugLocInfo.DebugIdMap.find(Tuple); = DebugLocInfo.DebugIdMap.find(Tuple);
if (II != DebugLocInfo.DebugIdMap.end()) if (II != DebugLocInfo.DebugIdMap.end())

2
llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
View File

@ -60,7 +60,7 @@ AsmPrinter::AsmPrinter(formatted_raw_ostream &o, TargetMachine &tm,
OutStreamer(*createAsmStreamer(OutContext, O, *T, 0)), OutStreamer(*createAsmStreamer(OutContext, O, *T, 0)),
LastMI(0), LastFn(0), Counter(~0U), LastMI(0), LastFn(0), Counter(~0U),
PrevDLT(0, ~0U, ~0U) { PrevDLT(0, 0, ~0U, ~0U) {
DW = 0; MMI = 0; DW = 0; MMI = 0;
switch (AsmVerbose) { switch (AsmVerbose) {
case cl::BOU_UNSET: VerboseAsm = VDef; break; case cl::BOU_UNSET: VerboseAsm = VDef; break;