[llvm] r309879 - DebugInfo: Test & handle (differently) non-zero DW_AT_ranges_base
David Blaikie via llvm-commits
llvm-commits at lists.llvm.org
Wed Aug 2 13:16:23 PDT 2017
Author: dblaikie
Date: Wed Aug 2 13:16:22 2017
New Revision: 309879
URL: http://llvm.org/viewvc/llvm-project?rev=309879&view=rev
Log:
DebugInfo: Test & handle (differently) non-zero DW_AT_ranges_base
Followup to r309570, fixing it slightly differently (ranges_base and
addr_base should never be read from a DWO file - so there shouldn't be
any issue with 'overriding' the values - conditionalize the code and
assert that the values aren't being overriden).
Modified:
llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFUnit.h
llvm/trunk/lib/DebugInfo/DWARF/DWARFUnit.cpp
llvm/trunk/test/DebugInfo/Inputs/split-dwarf-dwp.cpp
llvm/trunk/test/DebugInfo/Inputs/split-dwarf-dwp.o
llvm/trunk/test/DebugInfo/Inputs/split-dwarf-dwp.o.dwp
llvm/trunk/test/DebugInfo/llvm-symbolizer.test
Modified: llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFUnit.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFUnit.h?rev=309879&r1=309878&r2=309879&view=diff
==============================================================================
--- llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFUnit.h (original)
+++ llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFUnit.h Wed Aug 2 13:16:22 2017
@@ -123,7 +123,7 @@ class DWARFUnit {
const DWARFSection &StringOffsetSection;
uint64_t StringOffsetSectionBase = 0;
const DWARFSection *AddrOffsetSection;
- uint32_t AddrOffsetSectionBase;
+ uint32_t AddrOffsetSectionBase = 0;
bool isLittleEndian;
bool isDWO;
const DWARFUnitSectionBase &UnitSection;
Modified: llvm/trunk/lib/DebugInfo/DWARF/DWARFUnit.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARF/DWARFUnit.cpp?rev=309879&r1=309878&r2=309879&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/DWARF/DWARFUnit.cpp (original)
+++ llvm/trunk/lib/DebugInfo/DWARF/DWARFUnit.cpp Wed Aug 2 13:16:22 2017
@@ -245,12 +245,13 @@ size_t DWARFUnit::extractDIEsIfNeeded(bo
auto BaseAddr = toAddress(UnitDie.find({DW_AT_low_pc, DW_AT_entry_pc}));
if (BaseAddr)
setBaseAddress(*BaseAddr);
- Optional<DWARFFormValue> AddrBase = UnitDie.find(DW_AT_GNU_addr_base);
- if (AddrBase)
- AddrOffsetSectionBase = *toSectionOffset(AddrBase);
- Optional<DWARFFormValue> RngListsBase = UnitDie.find(DW_AT_rnglists_base);
- if (RngListsBase)
- RangeSectionBase = *toSectionOffset(RngListsBase);
+ if (!isDWO) {
+ assert(AddrOffsetSectionBase == 0);
+ assert(RangeSectionBase == 0);
+ AddrOffsetSectionBase =
+ toSectionOffset(UnitDie.find(DW_AT_GNU_addr_base), 0);
+ RangeSectionBase = toSectionOffset(UnitDie.find(DW_AT_rnglists_base), 0);
+ }
// In general, we derive the offset of the unit's contibution to the
// debug_str_offsets{.dwo} section from the unit DIE's
Modified: llvm/trunk/test/DebugInfo/Inputs/split-dwarf-dwp.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Inputs/split-dwarf-dwp.cpp?rev=309879&r1=309878&r2=309879&view=diff
==============================================================================
--- llvm/trunk/test/DebugInfo/Inputs/split-dwarf-dwp.cpp (original)
+++ llvm/trunk/test/DebugInfo/Inputs/split-dwarf-dwp.cpp Wed Aug 2 13:16:22 2017
@@ -1,12 +1,22 @@
-void f1();
-__attribute__((always_inline)) void f2() {
+__attribute__((optnone)) void f1() {}
+inline __attribute__((always_inline)) void f2() {
f1();
}
-void f3() {
+// throw a gap in the address range to force use of DW_AT_ranges, ranges_base,
+// range contribution in the .dwo file, etc.
+__attribute__((nodebug)) void gap() {
+}
+int main() {
f2();
}
-To produce split-dwarf-dwp.o{,dwp}, run:
-
- $ clang++ split-dwarf-dwp.cpp -gsplit-dwarf -c -Xclang -fdebug-compilation-dir=Output -fno-split-dwarf-inlining
- $ llvm-dwp split-dwarf-dwp.dwo -o split-dwarf-dwp.o.dwp
+// To produce split-dwarf-dwp.o{,dwp}, Create another file that has ranges, so
+// the ranges_base of the CU for split-dwarf-dwp.cpp is non-zero.
+//
+// $ cat > other.cpp
+// void other1() {}
+// __attribute__((nodebug)) void other2() {}
+// void other3() {}
+// $ clang++ other.cpp split-dwarf-dwp.cpp -gsplit-dwarf -c -Xclang -fdebug-compilation-dir -Xclang Output -fno-split-dwarf-inlining
+// $ llvm-dwp other.dwo other.dwo split-dwarf-dwp.dwo -o test/DebugInfo/Inputs/split-dwarf-dwp.o.dwp
+// $ ld -r other.o split-dwarf-dwp.o -o test/DebugInfo/Inputs/split-dwarf-dwp.o
Modified: llvm/trunk/test/DebugInfo/Inputs/split-dwarf-dwp.o
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Inputs/split-dwarf-dwp.o?rev=309879&r1=309878&r2=309879&view=diff
==============================================================================
Binary files llvm/trunk/test/DebugInfo/Inputs/split-dwarf-dwp.o (original) and llvm/trunk/test/DebugInfo/Inputs/split-dwarf-dwp.o Wed Aug 2 13:16:22 2017 differ
Modified: llvm/trunk/test/DebugInfo/Inputs/split-dwarf-dwp.o.dwp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/Inputs/split-dwarf-dwp.o.dwp?rev=309879&r1=309878&r2=309879&view=diff
==============================================================================
Binary files llvm/trunk/test/DebugInfo/Inputs/split-dwarf-dwp.o.dwp (original) and llvm/trunk/test/DebugInfo/Inputs/split-dwarf-dwp.o.dwp Wed Aug 2 13:16:22 2017 differ
Modified: llvm/trunk/test/DebugInfo/llvm-symbolizer.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/llvm-symbolizer.test?rev=309879&r1=309878&r2=309879&view=diff
==============================================================================
--- llvm/trunk/test/DebugInfo/llvm-symbolizer.test (original)
+++ llvm/trunk/test/DebugInfo/llvm-symbolizer.test Wed Aug 2 13:16:22 2017
@@ -51,7 +51,7 @@ RUN: llvm-symbolizer --functions=linkage
RUN: --default-arch=i386 < %t.input | FileCheck --check-prefix=SPLIT --check-prefix=NODWO %s
RUN: cp %p/Inputs/split-dwarf-dwp.o %T/split-dwarf-dwp-different-name.o
-RUN: echo "%T/split-dwarf-dwp-different-name.o 0x4" > %t.input
+RUN: echo "%T/split-dwarf-dwp-different-name.o 0x54" > %t.input
RUN: llvm-symbolizer --functions=linkage --inlining --demangle=false \
RUN: --default-arch=i386 --dwp=%p/Inputs/split-dwarf-dwp.o.dwp < %t.input | FileCheck --check-prefix=DWP %s
@@ -158,8 +158,8 @@ CHECK-NEXT: split-dwarf-addr-object-relo
DWP: f2
DWP-NEXT: split-dwarf-dwp.cpp:3:3
-DWP-NEXT: f3
-DWP-NEXT: split-dwarf-dwp.cpp:6:0
+DWP-NEXT: main
+DWP-NEXT: split-dwarf-dwp.cpp:10:0
RUN: echo "unexisting-file 0x1234" > %t.input2
RUN: llvm-symbolizer < %t.input2 2>&1 | FileCheck %s --check-prefix=MISSING-FILE
More information about the llvm-commits
mailing list