[PATCH] D46134: [WebAssembly] objdump: Don't assume all relocations have symbols

[Sam Clegg via Phabricator via llvm-commits]

sbc100 created this revision.
Herald added subscribers: llvm-commits, sunfish, aheejin, jgravelle-google, dschuff, jfb.

Repository:
  rL LLVM

https://reviews.llvm.org/D46134

Files:
  test/tools/llvm-objdump/WebAssembly/relocations.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
@@ -920,10 +920,14 @@
   symbol_iterator SI = RelRef.getSymbol();
   std::string fmtbuf;
   raw_string_ostream fmt(fmtbuf);
-  Expected<StringRef> SymNameOrErr = SI->getName();
-  if (!SymNameOrErr) {
+  if (SI == Obj->symbol_end()) {
+    // Not all wasm relocations have symbols associated with them.
+    // In particular R_WEBASSEMBLY_TYPE_INDEX_LEB.
     fmt << Rel.Index;
   } else {
+    Expected<StringRef> SymNameOrErr = SI->getName();
+    if (!SymNameOrErr)
+      return errorToErrorCode(SymNameOrErr.takeError());
     StringRef SymName = *SymNameOrErr;
     Result.append(SymName.begin(), SymName.end());
   }
Index: test/tools/llvm-objdump/WebAssembly/relocations.test
===================================================================
--- test/tools/llvm-objdump/WebAssembly/relocations.test
+++ test/tools/llvm-objdump/WebAssembly/relocations.test
@@ -1,8 +1,16 @@
 ; RUN: llc -mtriple=wasm32-unknown-unknown-wasm -filetype=obj %s -o - | llvm-objdump -r - | FileCheck %s
 
- at foo1 = hidden global i32 1, align 4
- at foo2 = hidden global i32 1, align 4
- at bar = hidden global i32* @foo2, align 4
+ at foo = external global i32, align 4
+ at bar = global i32* @foo, align 4
+
+define void @make_call(void ()* nocapture %func) {
+entry:
+  call void %func()
+  ret void
+}
+
+; CHECK:      RELOCATION RECORDS FOR [CODE]:
+; CHECK-NEXT: 00000006 R_WEBASSEMBLY_TYPE_INDEX_LEB 1+0
 
 ; CHECK:      RELOCATION RECORDS FOR [DATA]:
-; CHECK-NEXT: 00000018 R_WEBASSEMBLY_MEMORY_ADDR_I32 foo2+0
+; CHECK-NEXT: 00000006 R_WEBASSEMBLY_MEMORY_ADDR_I32 foo+0


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D46134.144148.patch
Type: text/x-patch
Size: 1743 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180426/ee8ea4b3/attachment.bin>