[llvm] r312294 - [WebAssembly] Fix getSymbolValue() for data symbols
Sam Clegg via llvm-commits
llvm-commits at lists.llvm.org
Thu Aug 31 16:22:44 PDT 2017
Author: sbc
Date: Thu Aug 31 16:22:44 2017
New Revision: 312294
URL: http://llvm.org/viewvc/llvm-project?rev=312294&view=rev
Log:
[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
Modified:
llvm/trunk/lib/Object/WasmObjectFile.cpp
llvm/trunk/test/Object/nm-trivial-object.test
llvm/trunk/test/tools/llvm-nm/wasm/exports.yaml
llvm/trunk/test/tools/llvm-nm/wasm/weak-symbols.yaml
llvm/trunk/test/tools/llvm-objdump/WebAssembly/symbol-table.test
Modified: llvm/trunk/lib/Object/WasmObjectFile.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/WasmObjectFile.cpp?rev=312294&r1=312293&r2=312294&view=diff
==============================================================================
--- llvm/trunk/lib/Object/WasmObjectFile.cpp (original)
+++ llvm/trunk/lib/Object/WasmObjectFile.cpp Thu Aug 31 16:22:44 2017
@@ -786,8 +786,13 @@ uint64_t WasmObjectFile::getSymbolValueI
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;
}
Modified: llvm/trunk/test/Object/nm-trivial-object.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/nm-trivial-object.test?rev=312294&r1=312293&r2=312294&view=diff
==============================================================================
--- llvm/trunk/test/Object/nm-trivial-object.test (original)
+++ llvm/trunk/test/Object/nm-trivial-object.test Thu Aug 31 16:22:44 2017
@@ -62,7 +62,7 @@ COFF32-NEXT: U _puts
WASM: U SomeOtherFunction
WASM-NEXT: 00000002 T main
WASM-NEXT: U puts
-WASM-NEXT: 00000001 D var
+WASM-NEXT: 00000010 D var
COFF64: 00000000 d .data
COFF64-NEXT: 00000000 t .text
Modified: llvm/trunk/test/tools/llvm-nm/wasm/exports.yaml
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-nm/wasm/exports.yaml?rev=312294&r1=312293&r2=312294&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-nm/wasm/exports.yaml (original)
+++ llvm/trunk/test/tools/llvm-nm/wasm/exports.yaml Thu Aug 31 16:22:44 2017
@@ -40,5 +40,5 @@ Sections:
Kind: GLOBAL
Index: 0x00000002
-# CHECK: 00000002 D bar
+# CHECK: 00000400 D bar
# CHECK: 00000004 T foo
Modified: llvm/trunk/test/tools/llvm-nm/wasm/weak-symbols.yaml
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-nm/wasm/weak-symbols.yaml?rev=312294&r1=312293&r2=312294&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-nm/wasm/weak-symbols.yaml (original)
+++ llvm/trunk/test/tools/llvm-nm/wasm/weak-symbols.yaml Thu Aug 31 16:22:44 2017
@@ -64,7 +64,7 @@ Sections:
- Name: weak_import_data
Flags: 1
-# CHECK: 00000002 W weak_global_data
+# CHECK: 00000400 W weak_global_data
# CHECK: 00000004 W weak_global_func
# CHECK: w weak_import_data
# CHECK: w weak_import_func
Modified: llvm/trunk/test/tools/llvm-objdump/WebAssembly/symbol-table.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objdump/WebAssembly/symbol-table.test?rev=312294&r1=312293&r2=312294&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-objdump/WebAssembly/symbol-table.test (original)
+++ llvm/trunk/test/tools/llvm-objdump/WebAssembly/symbol-table.test Thu Aug 31 16:22:44 2017
@@ -4,7 +4,7 @@ CHECK: SYMBOL TABLE:
CHECK-NEXT: 00000000 l F IMPORT puts
CHECK-NEXT: 00000000 l F IMPORT SomeOtherFunction
CHECK-NEXT: 00000002 g F EXPORT main
-CHECK-NEXT: 00000001 g EXPORT var
+CHECK-NEXT: 00000010 g EXPORT var
CHECK-NEXT: 00000000 l F name puts
CHECK-NEXT: 00000001 l F name SomeOtherFunction
CHECK-NEXT: 00000002 l F name main
More information about the llvm-commits
mailing list