RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-19 02:52:53 +02:00
Code Issues Projects Releases Wiki Activity

[DebugInfo] Use WithColor for more debug line warnings

Browse Source 
Updated two more debug line related warnings to use WithColor. This was
necessary to ensure consistent output order of the warnings on Windows
for debug line tests.

Differential Revision: https://reviews.llvm.org/D45871

llvm-svn: 330440
This commit is contained in:
Andrew Ng 2018-04-20 15:29:47 +00:00
parent 5cb0cef17d
commit 8dc720bb33
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/DebugInfo/DWARF/DWARFDebugLine.cpp
View File

@ -554,9 +554,10 @@ bool DWARFDebugLine::LineTable::parse(DWARFDataExtractor &DebugLineData,
if (DebugLineData.getAddressSize() == 0)
DebugLineData.setAddressSize(Len - 1);
else if (DebugLineData.getAddressSize() != Len - 1) {
fprintf(stderr, "Mismatching address size at offset 0x%8.8" PRIx32
" expected 0x%2.2" PRIx8 " found 0x%2.2" PRIx64 "\n",
ExtOffset, DebugLineData.getAddressSize(), Len - 1);
WithColor::warning()
<< format("mismatching address size at offset 0x%8.8" PRIx32
" expected 0x%2.2" PRIx8 " found 0x%2.2" PRIx64 "\n",
ExtOffset, DebugLineData.getAddressSize(), Len - 1);
// Skip the rest of the line-number program.
*OffsetPtr = EndOffset;
return false;
@ -621,9 +622,10 @@ bool DWARFDebugLine::LineTable::parse(DWARFDataExtractor &DebugLineData,
// Make sure the stated and parsed lengths are the same.
// Otherwise we have an unparseable line-number program.
if (*OffsetPtr - ExtOffset != Len) {
fprintf(stderr, "Unexpected line op length at offset 0x%8.8" PRIx32
" expected 0x%2.2" PRIx64 " found 0x%2.2" PRIx32 "\n",
ExtOffset, Len, *OffsetPtr - ExtOffset);
WithColor::warning()
<< format("unexpected line op length at offset 0x%8.8" PRIx32
" expected 0x%2.2" PRIx64 " found 0x%2.2" PRIx32 "\n",
ExtOffset, Len, *OffsetPtr - ExtOffset);
// Skip the rest of the line-number program.
*OffsetPtr = EndOffset;
return false;

2
test/DebugInfo/X86/dwarfdump-bogus-LNE.s
View File

@ -148,7 +148,7 @@ LT2_header_end:
.byte 1 # DW_LNE_end_sequence
LT2_end:
# ERR: Unexpected line op length at offset 0x0000005e
# ERR: warning: unexpected line op length at offset 0x0000005e
# ERR-SAME: expected 0x02 found 0x01
# The above parsing errors still let us move to the next unit.

2
test/DebugInfo/X86/dwarfdump-line-mismatch.s
View File

@ -4,7 +4,7 @@
# RUN: llvm-mc -filetype=obj -triple i686-linux-gnu %s -o - | \
# RUN: llvm-dwarfdump -debug-line - 2>&1 | FileCheck %s
# CHECK: Mismatching address size at offset 0x{{[0-9a-f]+}}
# CHECK: warning: mismatching address size at offset 0x{{[0-9a-f]+}}
# CHECK-SAME: expected 0x08 found 0x04
.text
.file "reduced.c"