| commit | b09cfa51040a5ab4980d83984c33d7cf459d9a0a | [log] [tgz] |
|---|---|---|
| author | Sam Clegg <sbc@chromium.org> | Thu Aug 31 23:22:44 2017 +0000 |
| committer | Sam Clegg <sbc@chromium.org> | Thu Aug 31 23:22:44 2017 +0000 |
| tree | 2b15edb1a9d786e6f300d060bdfd083ead2cc5ae | |
| parent | 5372fb8cc1abe6e6b1619beb8722b4596a61200e [diff] |
[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
diff --git a/llvm/test/Object/nm-trivial-object.test b/llvm/test/Object/nm-trivial-object.test index f1aadd5..0be998e 100644 --- a/llvm/test/Object/nm-trivial-object.test +++ b/llvm/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
diff --git a/llvm/test/tools/llvm-nm/wasm/exports.yaml b/llvm/test/tools/llvm-nm/wasm/exports.yaml index 6d2f12d..420cc2f 100644 --- a/llvm/test/tools/llvm-nm/wasm/exports.yaml +++ b/llvm/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
diff --git a/llvm/test/tools/llvm-nm/wasm/weak-symbols.yaml b/llvm/test/tools/llvm-nm/wasm/weak-symbols.yaml index b0796d6..91c4dd6 100644 --- a/llvm/test/tools/llvm-nm/wasm/weak-symbols.yaml +++ b/llvm/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
diff --git a/llvm/test/tools/llvm-objdump/WebAssembly/symbol-table.test b/llvm/test/tools/llvm-objdump/WebAssembly/symbol-table.test index 2c49d5d..f64088f 100644 --- a/llvm/test/tools/llvm-objdump/WebAssembly/symbol-table.test +++ b/llvm/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