diff options
| -rw-r--r-- | llvm/test/tools/llvm-objdump/WebAssembly/relocations.test | 16 | ||||
| -rw-r--r-- | llvm/tools/llvm-objdump/llvm-objdump.cpp | 8 |
2 files changed, 18 insertions, 6 deletions
diff --git a/llvm/test/tools/llvm-objdump/WebAssembly/relocations.test b/llvm/test/tools/llvm-objdump/WebAssembly/relocations.test index 4f4c1b5738f..9a8c7b7cdd4 100644 --- a/llvm/test/tools/llvm-objdump/WebAssembly/relocations.test +++ b/llvm/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 -@foo1 = hidden global i32 1, align 4 -@foo2 = hidden global i32 1, align 4 -@bar = hidden global i32* @foo2, align 4 +@foo = external global i32, align 4 +@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 diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp index f32ff062c23..0a1f0e2cda7 100644 --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp +++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp @@ -920,10 +920,14 @@ static std::error_code getRelocationValueString(const WasmObjectFile *Obj, 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()); } |
