From: Jonas Devlieghere Date: Tue, 15 Oct 2019 23:43:37 +0000 (+0000) Subject: [dsymutil] Support and relocate base address selection entries for debug_loc X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cd6834c109a8d99666ab4471b6f275bd32e09766;p=llvm [dsymutil] Support and relocate base address selection entries for debug_loc Since r374600 clang emits base address selection entries. Currently dsymutil does not support these entries and incorrectly interprets them as location list entries. This patch adds support for base address selection entries in dsymutil and makes sure they are relocated correctly. Thanks to Dave for coming up with the test case! Differential revision: https://reviews.llvm.org/D69005 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@374957 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/test/tools/dsymutil/Inputs/private/tmp/baseaddr/loc1.o b/test/tools/dsymutil/Inputs/private/tmp/baseaddr/loc1.o new file mode 100644 index 00000000000..f92ea7b2f82 Binary files /dev/null and b/test/tools/dsymutil/Inputs/private/tmp/baseaddr/loc1.o differ diff --git a/test/tools/dsymutil/Inputs/private/tmp/baseaddr/loc1.x86_64 b/test/tools/dsymutil/Inputs/private/tmp/baseaddr/loc1.x86_64 new file mode 100755 index 00000000000..39921d4c14e Binary files /dev/null and b/test/tools/dsymutil/Inputs/private/tmp/baseaddr/loc1.x86_64 differ diff --git a/test/tools/dsymutil/X86/debug-loc-base-addr.test b/test/tools/dsymutil/X86/debug-loc-base-addr.test new file mode 100644 index 00000000000..de5f30fce17 --- /dev/null +++ b/test/tools/dsymutil/X86/debug-loc-base-addr.test @@ -0,0 +1,29 @@ +RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/baseaddr/loc1.x86_64 -f -o - | llvm-dwarfdump -debug-loc - | FileCheck %s + +The test was compiled from a single source: +$ cat loc1.cpp +int f1(int i, int j) { + int x = 5; + int y = 3; + int r = i + j; + int undef; + x = undef; + y = 4; + return r; +} +__attribute__((nodebug)) void f2() { +} +int main() { + return 0; +} + +CHECK: .debug_loc contents: +CHECK: [0xffffffffffffffff, 0x0000000100000f90): +CHECK: [0x0000000000000004, 0x0000000000000007): DW_OP_consts +3, DW_OP_stack_value +CHECK: [0x0000000000000007, 0x0000000000000009): DW_OP_consts +4, DW_OP_stack_value + +CHECK: [0xffffffffffffffff, 0x0000000100000f90): +CHECK: [0x0000000000000004, 0x0000000000000007): DW_OP_consts +5, DW_OP_stack_value + +CHECK: [0xffffffffffffffff, 0x0000000100000f90): +CHECK: [0x0000000000000007, 0x0000000000000009): DW_OP_reg0 RAX diff --git a/tools/dsymutil/DwarfStreamer.cpp b/tools/dsymutil/DwarfStreamer.cpp index 732260f0346..88ca4b34a3e 100644 --- a/tools/dsymutil/DwarfStreamer.cpp +++ b/tools/dsymutil/DwarfStreamer.cpp @@ -399,6 +399,9 @@ void DwarfStreamer::emitLocationsForUnit( MS->SwitchSection(MC->getObjectFileInfo()->getDwarfLocSection()); unsigned AddressSize = Unit.getOrigUnit().getAddressByteSize(); + uint64_t BaseAddressMarker = (AddressSize == 8) + ? std::numeric_limits::max() + : std::numeric_limits::max(); const DWARFSection &InputSec = Dwarf.getDWARFObj().getLocSection(); DataExtractor Data(InputSec.Data, Dwarf.isLittleEndian(), AddressSize); DWARFUnit &OrigUnit = Unit.getOrigUnit(); @@ -418,11 +421,20 @@ void DwarfStreamer::emitLocationsForUnit( uint64_t Low = Data.getUnsigned(&Offset, AddressSize); uint64_t High = Data.getUnsigned(&Offset, AddressSize); LocSectionSize += 2 * AddressSize; + // End of list entry. if (Low == 0 && High == 0) { Asm->OutStreamer->EmitIntValue(0, AddressSize); Asm->OutStreamer->EmitIntValue(0, AddressSize); break; } + // Base address selection entry. + if (Low == BaseAddressMarker) { + Asm->OutStreamer->EmitIntValue(BaseAddressMarker, AddressSize); + Asm->OutStreamer->EmitIntValue(High + Attr.second, AddressSize); + LocPcOffset = 0; + continue; + } + // Location list entry. Asm->OutStreamer->EmitIntValue(Low + LocPcOffset, AddressSize); Asm->OutStreamer->EmitIntValue(High + LocPcOffset, AddressSize); uint64_t Length = Data.getU16(&Offset);