[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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@312294 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Object/WasmObjectFile.cpp b/lib/Object/WasmObjectFile.cpp
index 8a2fb38f58ac8c9c44302ab5c6b5d15fd9fa3732..ad8c2b706de22af6362bcb6d5e35458c5c8aebbc 100644 (file)
--- a/lib/Object/WasmObjectFile.cpp
+++ b/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;
   }

diff --git a/test/Object/nm-trivial-object.test b/test/Object/nm-trivial-object.test
index f1aadd5cccf59e3610c366aa20de94f84cb29e47..0be998e8605b9d0d2868dfc18d19695e809d6cd4 100644 (file)
--- a/test/Object/nm-trivial-object.test
+++ b/test/Object/nm-trivial-object.test
@@ -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

diff --git a/test/tools/llvm-nm/wasm/exports.yaml b/test/tools/llvm-nm/wasm/exports.yaml
index 6d2f12d1feba31fb2ce6dd02b87c64bf744b3e96..420cc2f5dbb6ff45c22140c402b6465c248267ca 100644 (file)
--- a/test/tools/llvm-nm/wasm/exports.yaml
+++ b/test/tools/llvm-nm/wasm/exports.yaml
@@ -40,5 +40,5 @@ Sections:
         Kind:            GLOBAL
         Index:           0x00000002
 
-# CHECK: 00000002 D bar
+# CHECK: 00000400 D bar
 # CHECK: 00000004 T foo

diff --git a/test/tools/llvm-nm/wasm/weak-symbols.yaml b/test/tools/llvm-nm/wasm/weak-symbols.yaml
index b0796d607e5194ac2770f30289f2e0c4be3720d0..91c4dd6262a778ba929ccbcb02c6cb8dacff3fd0 100644 (file)
--- a/test/tools/llvm-nm/wasm/weak-symbols.yaml
+++ b/test/tools/llvm-nm/wasm/weak-symbols.yaml
@@ -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

diff --git a/test/tools/llvm-objdump/WebAssembly/symbol-table.test b/test/tools/llvm-objdump/WebAssembly/symbol-table.test
index 2c49d5d65c5d742c4eb93f68651c1517642173ad..f64088f9ecf5be97cf89e5c216af23846334b0fe 100644 (file)
--- a/test/tools/llvm-objdump/WebAssembly/symbol-table.test
+++ b/test/tools/llvm-objdump/WebAssembly/symbol-table.test
@@ -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