diff options
| author | Andrew Ng <anng.sw@gmail.com> | 2018-04-20 15:29:47 +0000 |
|---|---|---|
| committer | Andrew Ng <anng.sw@gmail.com> | 2018-04-20 15:29:47 +0000 |
| commit | 7a2fa74ab046353c5ea337e96212375008547314 (patch) | |
| tree | 60741873373a17d78eead8c999e3c6aadead048f | |
| parent | ab9798765c51233e10c4a6a4eae03ef33e294eb4 (diff) | |
| download | bcm5719-llvm-7a2fa74ab046353c5ea337e96212375008547314.tar.gz bcm5719-llvm-7a2fa74ab046353c5ea337e96212375008547314.zip | |
[DebugInfo] Use WithColor for more debug line warnings
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
| -rw-r--r-- | llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp | 14 | ||||
| -rw-r--r-- | llvm/test/DebugInfo/X86/dwarfdump-bogus-LNE.s | 2 | ||||
| -rw-r--r-- | llvm/test/DebugInfo/X86/dwarfdump-line-mismatch.s | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp index dd74ea3a594..257d309b373 100644 --- a/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp +++ b/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp @@ -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; diff --git a/llvm/test/DebugInfo/X86/dwarfdump-bogus-LNE.s b/llvm/test/DebugInfo/X86/dwarfdump-bogus-LNE.s index d094672ff98..aa2a416df7a 100644 --- a/llvm/test/DebugInfo/X86/dwarfdump-bogus-LNE.s +++ b/llvm/test/DebugInfo/X86/dwarfdump-bogus-LNE.s @@ -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. diff --git a/llvm/test/DebugInfo/X86/dwarfdump-line-mismatch.s b/llvm/test/DebugInfo/X86/dwarfdump-line-mismatch.s index a34ec6e0802..663b833bca9 100644 --- a/llvm/test/DebugInfo/X86/dwarfdump-line-mismatch.s +++ b/llvm/test/DebugInfo/X86/dwarfdump-line-mismatch.s @@ -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" |
