summaryrefslogtreecommitdiffstats
path: root/llvm
diff options
context:
space:
mode:
authorDavid Blaikie <dblaikie@gmail.com>2016-12-16 17:10:17 +0000
committerDavid Blaikie <dblaikie@gmail.com>2016-12-16 17:10:17 +0000
commit7d4a5599daa214da4d7f01cf782acda9b6239acf (patch)
tree0e7d1651150497f1fea5b3b544a8a8f42f27b53a /llvm
parentf9416af1917cbd55a6f4b9760948442fa7382adf (diff)
downloadbcm5719-llvm-7d4a5599daa214da4d7f01cf782acda9b6239acf.tar.gz
bcm5719-llvm-7d4a5599daa214da4d7f01cf782acda9b6239acf.zip
Revert "dwarfdump: Support/process relocations on a CU's abbrev_off"
Reverting because this breaks lld's gdb_index support - it's probably double counting the abbrev relocation offset. This reverts commit r289954. llvm-svn: 289961
Diffstat (limited to 'llvm')
-rw-r--r--llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp3
-rw-r--r--llvm/test/DebugInfo/Inputs/dwarfdump-abbrev-off.elf-x86-64bin2720 -> 0 bytes
-rw-r--r--llvm/test/DebugInfo/dwarfdump-abbrev-off.test8
3 files changed, 0 insertions, 11 deletions
diff --git a/llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp b/llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp
index 8e5691aebab..2ddbc507ff6 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp
@@ -87,10 +87,7 @@ bool DWARFUnit::getStringOffsetSectionItem(uint32_t Index,
bool DWARFUnit::extractImpl(DataExtractor debug_info, uint32_t *offset_ptr) {
Length = debug_info.getU32(offset_ptr);
Version = debug_info.getU16(offset_ptr);
- auto AI = InfoSection.Relocs.find(*offset_ptr);
uint64_t AbbrOffset = debug_info.getU32(offset_ptr);
- if (AI != InfoSection.Relocs.end())
- AbbrOffset += AI->second.second;
if (IndexEntry) {
if (AbbrOffset)
return false;
diff --git a/llvm/test/DebugInfo/Inputs/dwarfdump-abbrev-off.elf-x86-64 b/llvm/test/DebugInfo/Inputs/dwarfdump-abbrev-off.elf-x86-64
deleted file mode 100644
index bc196b5995b..00000000000
--- a/llvm/test/DebugInfo/Inputs/dwarfdump-abbrev-off.elf-x86-64
+++ /dev/null
Binary files differ
diff --git a/llvm/test/DebugInfo/dwarfdump-abbrev-off.test b/llvm/test/DebugInfo/dwarfdump-abbrev-off.test
deleted file mode 100644
index 2937d8cbdde..00000000000
--- a/llvm/test/DebugInfo/dwarfdump-abbrev-off.test
+++ /dev/null
@@ -1,8 +0,0 @@
-RUN: llvm-dwarfdump -debug-dump=info %p/Inputs/dwarfdump-abbrev-off.elf-x86-64 | FileCheck %s
-
-Check that we apply relocations to the abbr_offset - while LLVM never produces
-an object file like this, a reproduction can be produced by linking two simple
-object files together with ld -r.
-
-CHECK: abbr_offset = 0x0000
-CHECK: abbr_offset = 0x0010
OpenPOWER on IntegriCloud