RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-26 12:43:36 +01:00
Code Issues Projects Releases Wiki Activity

[DebugInfo] Do not error on unsupported CIE version

Browse Source 
D81469 introduced a check to error on CIE version different
than 1 for eh_frame, but older compilers mistakenly create binaries
with this version set to 3 for DWARF4 or 4 to DWARF5. Move the check
to dump time instead of eh_frame parse time, so we can be tolerant
with older binaries.

Reviewed By: aprantl

Differential Revision: https://reviews.llvm.org/D97830
This commit is contained in:
Rafael Auler 2021-03-08 19:21:16 -08:00
parent 50d76ad4d1
commit 2b6009cd7d
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/DebugInfo/DWARF/DWARFDebugFrame.cpp
View File

@ -891,8 +891,10 @@ void CIE::dump(raw_ostream &OS, DIDumpOptions DumpOpts,
<< format(" %0*" PRIx64, IsDWARF64 && !IsEH ? 16 : 8,
getCIEId(IsDWARF64, IsEH))
<< " CIE\n"
<< " Format: " << FormatString(IsDWARF64) << "\n"
<< format(" Version: %d\n", Version)
<< " Format: " << FormatString(IsDWARF64) << "\n";
if (IsEH && Version != 1)
OS << "WARNING: unsupported CIE version\n";
OS << format(" Version: %d\n", Version)
<< " Augmentation: \"" << Augmentation << "\"\n";
if (Version >= 4) {
OS << format(" Address size: %u\n", (uint32_t)AddressSize);
@ -1012,11 +1014,6 @@ Error DWARFDebugFrame::parse(DWARFDataExtractor Data) {
uint8_t Version = Data.getU8(&Offset);
const char *Augmentation = Data.getCStr(&Offset);
StringRef AugmentationString(Augmentation ? Augmentation : "");
// TODO: we should provide a way to report a warning and continue dumping.
if (IsEH && Version != 1)
return createStringError(errc::not_supported,
"unsupported CIE version: %" PRIu8, Version);
uint8_t AddressSize = Version < 4 ? Data.getAddressSize() :
Data.getU8(&Offset);
Data.setAddressSize(AddressSize);

4
test/DebugInfo/X86/eh-frame-invalid-version-zero.s
View File

@ -1,9 +1,9 @@
## Check we do not support .eh_frame sections of version 0.
# RUN: llvm-mc -triple x86_64-unknown-linux %s -filetype=obj -o %t
# RUN: not llvm-dwarfdump -debug-frame %t 2>&1 | FileCheck %s
# RUN: llvm-dwarfdump -debug-frame %t 2>&1 | FileCheck %s
# CHECK: unsupported CIE version: 0
# CHECK: unsupported CIE version
.section .eh_frame,"a",@unwind
.long .Lend - .LCIEptr ## Length

4
test/DebugInfo/X86/eh-frame-invalid-version.s
View File

@ -1,9 +1,9 @@
## Check we do not support .eh_frame sections of versions greater than 1.
# RUN: llvm-mc -triple x86_64-unknown-linux %s -filetype=obj -o %t
# RUN: not llvm-dwarfdump -debug-frame %t 2>&1 | FileCheck %s
# RUN: llvm-dwarfdump -debug-frame %t 2>&1 | FileCheck %s
# CHECK: unsupported CIE version: 2
# CHECK: unsupported CIE version
.section .eh_frame,"a",@unwind
.long .Lend - .LCIEptr ## Length