summaryrefslogtreecommitdiffstats
path: root/llvm/tools/llvm-objdump/llvm-objdump.cpp
diff options
context:
space:
mode:
authorSam Clegg <sbc@chromium.org>2018-04-26 16:41:51 +0000
committerSam Clegg <sbc@chromium.org>2018-04-26 16:41:51 +0000
commitf676cdd515d664e93ecbf8506af9610250195827 (patch)
tree947f2ec56255d54fcbb34e764954a10ed0b24a35 /llvm/tools/llvm-objdump/llvm-objdump.cpp
parentf760b2c0875d8194f8bacda425789e278a0d705d (diff)
downloadbcm5719-llvm-f676cdd515d664e93ecbf8506af9610250195827.tar.gz
bcm5719-llvm-f676cdd515d664e93ecbf8506af9610250195827.zip
[WebAssembly] Implement getRelocationValueString()
And use it in llvm-objdump. Differential Revision: https://reviews.llvm.org/D46092 llvm-svn: 330957
Diffstat (limited to 'llvm/tools/llvm-objdump/llvm-objdump.cpp')
-rw-r--r--llvm/tools/llvm-objdump/llvm-objdump.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
index 5bea3a7860b..f32ff062c23 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp
@@ -917,9 +917,17 @@ static std::error_code getRelocationValueString(const WasmObjectFile *Obj,
const RelocationRef &RelRef,
SmallVectorImpl<char> &Result) {
const wasm::WasmRelocation& Rel = Obj->getWasmRelocation(RelRef);
+ symbol_iterator SI = RelRef.getSymbol();
std::string fmtbuf;
raw_string_ostream fmt(fmtbuf);
- fmt << Rel.Index << (Rel.Addend < 0 ? "" : "+") << Rel.Addend;
+ Expected<StringRef> SymNameOrErr = SI->getName();
+ if (!SymNameOrErr) {
+ fmt << Rel.Index;
+ } else {
+ StringRef SymName = *SymNameOrErr;
+ Result.append(SymName.begin(), SymName.end());
+ }
+ fmt << (Rel.Addend < 0 ? "" : "+") << Rel.Addend;
fmt.flush();
Result.append(fmtbuf.begin(), fmtbuf.end());
return std::error_code();
OpenPOWER on IntegriCloud