aboutsummaryrefslogtreecommitdiff
path: root/llvm/lib/Object/WasmObjectFile.cpp
diff options
context:
space:
mode:
authorSam Clegg <sbc@chromium.org>2017-08-31 23:22:44 +0000
committerSam Clegg <sbc@chromium.org>2017-08-31 23:22:44 +0000
commitb09cfa51040a5ab4980d83984c33d7cf459d9a0a (patch)
tree2b15edb1a9d786e6f300d060bdfd083ead2cc5ae /llvm/lib/Object/WasmObjectFile.cpp
parent5372fb8cc1abe6e6b1619beb8722b4596a61200e (diff)
downloadllvm-b09cfa51040a5ab4980d83984c33d7cf459d9a0a.zip
llvm-b09cfa51040a5ab4980d83984c33d7cf459d9a0a.tar.gz
llvm-b09cfa51040a5ab4980d83984c33d7cf459d9a0a.tar.bz2
[WebAssembly] Fix getSymbolValue() for data symbols
This is mostly a fix for the output of `llvm-nm` See Bug 34392: https://bugs.llvm.org//show_bug.cgi?id=34392 Differential Revision: https://reviews.llvm.org/D37359 llvm-svn: 312294
Diffstat (limited to 'llvm/lib/Object/WasmObjectFile.cpp')
-rw-r--r--llvm/lib/Object/WasmObjectFile.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/llvm/lib/Object/WasmObjectFile.cpp b/llvm/lib/Object/WasmObjectFile.cpp
index 8a2fb38..ad8c2b7 100644
--- a/llvm/lib/Object/WasmObjectFile.cpp
+++ b/llvm/lib/Object/WasmObjectFile.cpp
@@ -786,8 +786,13 @@ uint64_t WasmObjectFile::getSymbolValueImpl(DataRefImpl Symb) const {
case WasmSymbol::SymbolType::GLOBAL_IMPORT:
return 0;
case WasmSymbol::SymbolType::FUNCTION_EXPORT:
- case WasmSymbol::SymbolType::GLOBAL_EXPORT:
return Exports[Sym.ElementIndex].Index;
+ case WasmSymbol::SymbolType::GLOBAL_EXPORT: {
+ uint32_t GlobalIndex = Exports[Sym.ElementIndex].Index;
+ assert(GlobalIndex < Globals.size());
+ const wasm::WasmGlobal& Global = Globals[GlobalIndex];
+ return Global.InitExpr.Value.Int32;
+ }
case WasmSymbol::SymbolType::DEBUG_FUNCTION_NAME:
return Sym.ElementIndex;
}