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

AsmPrinter: Simplify logic for debug info intrinsics' !dbg attachments 

These are required, so just assume they're there.

llvm-svn: 235138
This commit is contained in:
Duncan P. N. Exon Smith 2015-04-16 22:12:59 +00:00
parent 54fff4c9e2
commit 78a9527062
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
llvm/lib/CodeGen/AsmPrinter/DbgValueHistoryCalculator.cpp
View File

@ -207,10 +207,7 @@ void llvm::calculateDbgValueHistory(const MachineFunction *MF,
MDLocalVariable *RawVar = MI.getDebugVariable();
assert(RawVar->isValidLocationForIntrinsic(MI.getDebugLoc()) &&
"Expected inlined-at fields to agree");
MDLocation *IA = nullptr;
if (MDLocation *Loc = MI.getDebugLoc())
IA = Loc->getInlinedAt();
InlinedVariable Var(RawVar, IA);
InlinedVariable Var(RawVar, MI.getDebugLoc()->getInlinedAt());
if (unsigned PrevReg = Result.getRegisterForVar(Var))
dropRegDescribedVar(RegVars, PrevReg, Var);

7
llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
View File

@ -711,7 +711,10 @@ void DwarfDebug::collectVariableInfoFromMMITable(
for (const auto &VI : MMI->getVariableDbgInfo()) {
if (!VI.Var)
continue;
InlinedVariable Var(VI.Var, VI.Loc ? VI.Loc->getInlinedAt() : nullptr);
assert(VI.Var->isValidLocationForIntrinsic(VI.Loc) &&
"Expected inlined-at fields to agree");
InlinedVariable Var(VI.Var, VI.Loc->getInlinedAt());
Processed.insert(Var);
LexicalScope *Scope = LScopes.findLexicalScope(VI.Loc);
@ -719,8 +722,6 @@ void DwarfDebug::collectVariableInfoFromMMITable(
if (!Scope)
continue;
assert(VI.Var->isValidLocationForIntrinsic(VI.Loc) &&
"Expected inlined-at fields to agree");
DIExpression Expr = cast_or_null<MDExpression>(VI.Expr);
ensureAbstractVariableIsCreatedIfScoped(Var, Scope->getScopeNode());
auto RegVar =

5
llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h
View File

@ -98,13 +98,10 @@ public:
/// AbstractVar may be NULL.
DbgVariable(const MachineInstr *DbgValue, DwarfDebug *DD)
: Var(DbgValue->getDebugVariable()),
IA(DbgValue->getDebugLoc() ? DbgValue->getDebugLoc()->getInlinedAt()
: nullptr),
IA(DbgValue->getDebugLoc()->getInlinedAt()),
Expr(1, DbgValue->getDebugExpression()), TheDIE(nullptr),
DotDebugLocOffset(~0U), MInsn(DbgValue), DD(DD) {
FrameIndex.push_back(~0);
if (MDLocation *Loc = DbgValue->getDebugLoc())
IA = Loc->getInlinedAt();
}
// Accessors.