[PATCH] D35239: [llvm-objdump] Properly print aarch64 addend relocations

[Martin Storsjö via Phabricator via llvm-commits]

mstorsjo created this revision.
Herald added subscribers: kristof.beyls, javed.absar, rengolin, aemerson.

Previously such relocations fell into the last case for local symbols, using the relocation addend as symbol index, leading to a crash.


https://reviews.llvm.org/D35239

Files:
  test/tools/llvm-objdump/AArch64/Inputs/reloc-addend.obj.macho-aarch64
  test/tools/llvm-objdump/AArch64/macho-reloc-addend.test
  tools/llvm-objdump/llvm-objdump.cpp


Index: tools/llvm-objdump/llvm-objdump.cpp
===================================================================
--- tools/llvm-objdump/llvm-objdump.cpp
+++ tools/llvm-objdump/llvm-objdump.cpp
@@ -870,7 +870,10 @@
   bool isExtern = O->getPlainRelocationExternal(RE);
   uint64_t Val = O->getPlainRelocationSymbolNum(RE);
 
-  if (isExtern) {
+  if (O->getAnyRelocationType(RE) == MachO::ARM64_RELOC_ADDEND) {
+    fmt << format("0x%x", Val);
+    return;
+  } else if (isExtern) {
     symbol_iterator SI = O->symbol_begin();
     advance(SI, Val);
     Expected<StringRef> SOrErr = SI->getName();
Index: test/tools/llvm-objdump/AArch64/macho-reloc-addend.test
===================================================================
--- /dev/null
+++ test/tools/llvm-objdump/AArch64/macho-reloc-addend.test
@@ -0,0 +1,6 @@
+RUN: llvm-objdump -r %p/Inputs/reloc-addend.obj.macho-aarch64 | FileCheck %s
+
+CHECK-DAG: 0000000000000004 ARM64_RELOC_ADDEND 0x999
+CHECK-DAG: 0000000000000004 ARM64_RELOC_PAGEOFF12 _stringbuf
+CHECK-DAG: 0000000000000000 ARM64_RELOC_ADDEND 0x999
+CHECK-DAG: 0000000000000000 ARM64_RELOC_PAGE21 _stringbuf


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D35239.105979.patch
Type: text/x-patch
Size: 1127 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170711/4bb9ae05/attachment.bin>