forked from OSchip/llvm-project
Emit debug info for MachineInstrs with unknown debug locations, instead
of just letting them inherit the debug locations of adjacent instructions. Debug info should aim to be either accurate or absent. llvm-svn: 103135
This commit is contained in:
parent
966a382ae7
commit
50849c63e4
|
@ -2150,8 +2150,20 @@ void DwarfDebug::collectVariableInfo() {
|
|||
void DwarfDebug::beginScope(const MachineInstr *MI) {
|
||||
// Check location.
|
||||
DebugLoc DL = MI->getDebugLoc();
|
||||
if (DL.isUnknown())
|
||||
if (DL.isUnknown()) {
|
||||
// This instruction has no debug location. If the preceding instruction
|
||||
// did, emit debug location information to indicate that the debug
|
||||
// location is now unknown.
|
||||
MCSymbol *Label = NULL;
|
||||
if (DL == PrevInstLoc)
|
||||
Label = PrevLabel;
|
||||
else {
|
||||
Label = recordSourceLine(DL.getLine(), DL.getCol(), 0);
|
||||
PrevInstLoc = DL;
|
||||
PrevLabel = Label;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
MDNode *Scope = DL.getScope(Asm->MF->getFunction()->getContext());
|
||||
|
||||
|
@ -2564,23 +2576,28 @@ MCSymbol *DwarfDebug::recordSourceLine(unsigned Line, unsigned Col, MDNode *S) {
|
|||
StringRef Dir;
|
||||
StringRef Fn;
|
||||
|
||||
DIDescriptor Scope(S);
|
||||
if (Scope.isCompileUnit()) {
|
||||
DICompileUnit CU(S);
|
||||
Dir = CU.getDirectory();
|
||||
Fn = CU.getFilename();
|
||||
} else if (Scope.isSubprogram()) {
|
||||
DISubprogram SP(S);
|
||||
Dir = SP.getDirectory();
|
||||
Fn = SP.getFilename();
|
||||
} else if (Scope.isLexicalBlock()) {
|
||||
DILexicalBlock DB(S);
|
||||
Dir = DB.getDirectory();
|
||||
Fn = DB.getFilename();
|
||||
} else
|
||||
assert(0 && "Unexpected scope info");
|
||||
unsigned Src = 1;
|
||||
if (S) {
|
||||
DIDescriptor Scope(S);
|
||||
|
||||
if (Scope.isCompileUnit()) {
|
||||
DICompileUnit CU(S);
|
||||
Dir = CU.getDirectory();
|
||||
Fn = CU.getFilename();
|
||||
} else if (Scope.isSubprogram()) {
|
||||
DISubprogram SP(S);
|
||||
Dir = SP.getDirectory();
|
||||
Fn = SP.getFilename();
|
||||
} else if (Scope.isLexicalBlock()) {
|
||||
DILexicalBlock DB(S);
|
||||
Dir = DB.getDirectory();
|
||||
Fn = DB.getFilename();
|
||||
} else
|
||||
assert(0 && "Unexpected scope info");
|
||||
|
||||
Src = GetOrCreateSourceID(Dir, Fn);
|
||||
}
|
||||
|
||||
unsigned Src = GetOrCreateSourceID(Dir, Fn);
|
||||
MCSymbol *Label = MMI->getContext().CreateTempSymbol();
|
||||
Lines.push_back(SrcLineInfo(Line, Col, Src, Label));
|
||||
|
||||
|
@ -2967,8 +2984,6 @@ void DwarfDebug::emitDebugLines() {
|
|||
MCSymbol *Label = LineInfo.getLabel();
|
||||
if (!Label->isDefined()) continue; // Not emitted, in dead code.
|
||||
|
||||
if (LineInfo.getLine() == 0) continue;
|
||||
|
||||
if (Asm->isVerbose()) {
|
||||
std::pair<unsigned, unsigned> SrcID =
|
||||
getSourceDirectoryAndFileIds(LineInfo.getSourceID());
|
||||
|
|
Loading…
Reference in New Issue