From fccaa89e23afac9c73964abffb42c19f70ca6460 Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Thu, 11 Jun 2020 13:04:26 +0200 Subject: [PATCH] [llvm/DWARFDebugLine] Fix a typo in one warning message --- lld/test/ELF/undef.s | 2 +- llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp | 2 +- llvm/test/tools/llvm-dwarfdump/X86/debug_line_invalid.test | 2 +- llvm/unittests/DebugInfo/DWARF/DWARFDebugLineTest.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lld/test/ELF/undef.s b/lld/test/ELF/undef.s index 4d9da45..4f39d20d 100644 --- a/lld/test/ELF/undef.s +++ b/lld/test/ELF/undef.s @@ -51,7 +51,7 @@ # Show that all line table problems are mentioned as soon as the object's line information # is requested, even if that particular part of the line information is not currently required. # Also show that the warnings are only printed once. -# CHECK: warning: unknown data in line table prologue at offset 0x00000000: parsing ended (at offset 0x00000037) before reaching the prologue at offset 0x00000038 +# CHECK: warning: unknown data in line table prologue at offset 0x00000000: parsing ended (at offset 0x00000037) before reaching the prologue end at offset 0x00000038 # CHECK-NEXT: warning: parsing line table prologue at offset 0x0000005b: unsupported version 1 # CHECK-NEXT: warning: last sequence in debug line table at offset 0x00000061 is not terminated # CHECK: error: undefined symbol: zed6a diff --git a/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp index 05effc9..2faee15 100644 --- a/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp +++ b/llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp @@ -433,7 +433,7 @@ Error DWARFDebugLine::Prologue::parse( errc::invalid_argument, "unknown data in line table prologue at offset 0x%8.8" PRIx64 ": parsing ended (at offset 0x%8.8" PRIx64 - ") before reaching the prologue at offset 0x%8.8" PRIx64, + ") before reaching the prologue end at offset 0x%8.8" PRIx64, PrologueOffset, *OffsetPtr, EndPrologueOffset)); } return Error::success(); diff --git a/llvm/test/tools/llvm-dwarfdump/X86/debug_line_invalid.test b/llvm/test/tools/llvm-dwarfdump/X86/debug_line_invalid.test index cb0e0ac..0b2116a 100644 --- a/llvm/test/tools/llvm-dwarfdump/X86/debug_line_invalid.test +++ b/llvm/test/tools/llvm-dwarfdump/X86/debug_line_invalid.test @@ -105,7 +105,7 @@ ## Prologue with length longer than parsed. # NONFATAL: debug_line[0x000000c7] -# SOME-ERR-NEXT: warning: unknown data in line table prologue at offset 0x000000c7: parsing ended (at offset 0x00000101) before reaching the prologue at offset 0x00000102 +# SOME-ERR-NEXT: warning: unknown data in line table prologue at offset 0x000000c7: parsing ended (at offset 0x00000101) before reaching the prologue end at offset 0x00000102 # NONFATAL-NEXT: Line table prologue # NONFATAL: file_names[ 2]: # NONFATAL-NEXT: name: "file2" diff --git a/llvm/unittests/DebugInfo/DWARF/DWARFDebugLineTest.cpp b/llvm/unittests/DebugInfo/DWARF/DWARFDebugLineTest.cpp index d00d4c89..d01c24a 100644 --- a/llvm/unittests/DebugInfo/DWARF/DWARFDebugLineTest.cpp +++ b/llvm/unittests/DebugInfo/DWARF/DWARFDebugLineTest.cpp @@ -427,7 +427,7 @@ TEST_P(DebugLineParameterisedFixture, ErrorForTooLargePrologueLength) { ("unknown data in line table prologue at offset 0x00000000: " "parsing ended (at offset 0x000000" + Twine::utohexstr(ExpectedEnd - 1) + - ") before reaching the prologue at offset 0x000000" + + ") before reaching the prologue end at offset 0x000000" + Twine::utohexstr(ExpectedEnd)) .str())); } -- 2.7.4