Correctly handle {Always,Never}StepIntoLine

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@259806 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Majnemer 2016-02-04 17:57:12 +00:00
parent 75a2a42e95
commit b4612d8832
2 changed files with 10 additions and 8 deletions

View File

@ -35,6 +35,7 @@ public:
}; };
LineInfo(uint32_t StartLine, uint32_t EndLine, bool IsStatement); LineInfo(uint32_t StartLine, uint32_t EndLine, bool IsStatement);
LineInfo(uint32_t LineData) : LineData(LineData) {}
uint32_t getStartLine() const { return LineData & StartLineMask; } uint32_t getStartLine() const { return LineData & StartLineMask; }

View File

@ -1154,14 +1154,15 @@ void COFFDumper::printCodeViewSymbolSection(StringRef SectionName,
char Buffer[32]; char Buffer[32];
format("+0x%X", PC).snprint(Buffer, 32); format("+0x%X", PC).snprint(Buffer, 32);
ListScope PCScope(W, Buffer); ListScope PCScope(W, Buffer);
uint32_t LineNumberStart = LineData & codeview::LineInfo::StartLineMask; LineInfo LI(LineData);
uint32_t LineNumberEndDelta = if (LI.isAlwaysStepInto())
(LineData & codeview::LineInfo::EndLineDeltaMask) >> W.printString("StepInto", StringRef("Always"));
codeview::LineInfo::EndLineDeltaShift; else if (LI.isNeverStepInto())
bool IsStatement = LineData & codeview::LineInfo::StatementFlag; W.printString("StepInto", StringRef("Never"));
W.printNumber("LineNumberStart", LineNumberStart); else
W.printNumber("LineNumberEndDelta", LineNumberEndDelta); W.printNumber("LineNumberStart", LI.getStartLine());
W.printBoolean("IsStatement", IsStatement); W.printNumber("LineNumberEndDelta", LI.getLineDelta());
W.printBoolean("IsStatement", LI.isStatement());
if (HasColumnInformation && if (HasColumnInformation &&
ColumnDE.isValidOffsetForDataOfSize(ColumnOffset, 4)) { ColumnDE.isValidOffsetForDataOfSize(ColumnOffset, 4)) {
uint16_t ColStart = ColumnDE.getU16(&ColumnOffset); uint16_t ColStart = ColumnDE.getU16(&ColumnOffset);