From: Igor Kudrin <ikudrin@accesssoftek.com>
Date: Tue, 11 Feb 2020 12:43:20 +0000 (+0700)
Subject: [DebugInfo] Fix reading addresses in DWARFDebugAddr.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5d58eb9f4f71292d9c67517d8cb0eb05e9fe82a3;p=platform%2Fupstream%2Fllvm.git

[DebugInfo] Fix reading addresses in DWARFDebugAddr.

As addresses in the address tables may have relocations, thus,
the relocations should be resolved to read the correct address.
That is especially important for targets that use RELA relocations
because in that case addends are stored in relocation sections.

Differential Revision: https://reviews.llvm.org/D74404
---

diff --git a/llvm/lib/DebugInfo/DWARF/DWARFDebugAddr.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDebugAddr.cpp
index 02b8b8e..ba2c177 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFDebugAddr.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFDebugAddr.cpp
@@ -131,10 +131,7 @@ Error DWARFDebugAddrTable::extract(DWARFDataExtractor Data,
   Data.setAddressSize(HeaderData.AddrSize);
   uint32_t AddrCount = DataSize / HeaderData.AddrSize;
   for (uint32_t I = 0; I < AddrCount; ++I)
-    if (HeaderData.AddrSize == 4)
-      Addrs.push_back(Data.getU32(OffsetPtr));
-    else
-      Addrs.push_back(Data.getU64(OffsetPtr));
+    Addrs.push_back(Data.getRelocatedAddress(OffsetPtr));
   return Error::success();
 }
 
diff --git a/llvm/test/tools/llvm-dwarfdump/X86/debug_addr_rela.s b/llvm/test/tools/llvm-dwarfdump/X86/debug_addr_rela.s
new file mode 100644
index 0000000..f0058b9
--- /dev/null
+++ b/llvm/test/tools/llvm-dwarfdump/X86/debug_addr_rela.s
@@ -0,0 +1,28 @@
+# RUN: llvm-mc %s -filetype obj -triple x86_64-pc-linux -o - | \
+# RUN:   llvm-dwarfdump -debug-addr - | \
+# RUN:   FileCheck %s
+
+## This checks that we use DWARFDataExtractor::getRelocatedAddress() to read
+## addresses of an address table. In this test, the raw data in the .debug_addr
+## section does not contain the full address, thus, it is required to resolve
+## a RELA relocation to recover the real value.
+
+# CHECK:      .debug_addr contents
+# CHECK-NEXT: length = 0x0000000c, version = 0x0005, addr_size = 0x08, seg_size = 0x00
+# CHECK-NEXT: Addrs: [
+# CHECK-NEXT: 0x000000000000002a
+# CHECK-NEXT: ]
+
+    .text
+    .space  0x2a
+.Lfoo:
+
+    .section .debug_addr,"",@progbits
+    .long   .LAddr0end-.LAddr0version   # Length
+.LAddr0version:
+    .short  5                           # Version
+    .byte   8                           # Address size
+    .byte   0                           # Segment selector size
+.LAddr0table:
+    .quad   .Lfoo
+.LAddr0end: