[PATCH] D37359: [WebAssembly] Fix getSymbolValue() for data symbols

[Phabricator via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL312294: [WebAssembly] Fix getSymbolValue() for data symbols (authored by sbc).

Repository:
  rL LLVM

https://reviews.llvm.org/D37359

Files:
  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


Index: llvm/trunk/lib/Object/WasmObjectFile.cpp
===================================================================
--- llvm/trunk/lib/Object/WasmObjectFile.cpp
+++ llvm/trunk/lib/Object/WasmObjectFile.cpp
@@ -786,8 +786,13 @@
   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;
   }
Index: llvm/trunk/test/Object/nm-trivial-object.test
===================================================================
--- llvm/trunk/test/Object/nm-trivial-object.test
+++ llvm/trunk/test/Object/nm-trivial-object.test
@@ -62,7 +62,7 @@
 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
Index: llvm/trunk/test/tools/llvm-nm/wasm/weak-symbols.yaml
===================================================================
--- llvm/trunk/test/tools/llvm-nm/wasm/weak-symbols.yaml
+++ llvm/trunk/test/tools/llvm-nm/wasm/weak-symbols.yaml
@@ -64,7 +64,7 @@
       - 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
Index: llvm/trunk/test/tools/llvm-nm/wasm/exports.yaml
===================================================================
--- llvm/trunk/test/tools/llvm-nm/wasm/exports.yaml
+++ llvm/trunk/test/tools/llvm-nm/wasm/exports.yaml
@@ -40,5 +40,5 @@
         Kind:            GLOBAL
         Index:           0x00000002
 
-# CHECK: 00000002 D bar
+# CHECK: 00000400 D bar
 # CHECK: 00000004 T foo
Index: llvm/trunk/test/tools/llvm-objdump/WebAssembly/symbol-table.test
===================================================================
--- llvm/trunk/test/tools/llvm-objdump/WebAssembly/symbol-table.test
+++ llvm/trunk/test/tools/llvm-objdump/WebAssembly/symbol-table.test
@@ -4,7 +4,7 @@
 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


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D37359.113489.patch
Type: text/x-patch
Size: 2789 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170831/e2288ef6/attachment.bin>