From b09cfa51040a5ab4980d83984c33d7cf459d9a0a Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Thu, 31 Aug 2017 23:22:44 +0000 Subject: [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 --- llvm/test/Object/nm-trivial-object.test | 2 +- llvm/test/tools/llvm-nm/wasm/exports.yaml | 2 +- llvm/test/tools/llvm-nm/wasm/weak-symbols.yaml | 2 +- llvm/test/tools/llvm-objdump/WebAssembly/symbol-table.test | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'llvm/test') diff --git a/llvm/test/Object/nm-trivial-object.test b/llvm/test/Object/nm-trivial-object.test index f1aadd5cccf..0be998e8605 100644 --- a/llvm/test/Object/nm-trivial-object.test +++ b/llvm/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/llvm/test/tools/llvm-nm/wasm/exports.yaml b/llvm/test/tools/llvm-nm/wasm/exports.yaml index 6d2f12d1feb..420cc2f5dbb 100644 --- a/llvm/test/tools/llvm-nm/wasm/exports.yaml +++ b/llvm/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/llvm/test/tools/llvm-nm/wasm/weak-symbols.yaml b/llvm/test/tools/llvm-nm/wasm/weak-symbols.yaml index b0796d607e5..91c4dd6262a 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 @@ 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/llvm/test/tools/llvm-objdump/WebAssembly/symbol-table.test b/llvm/test/tools/llvm-objdump/WebAssembly/symbol-table.test index 2c49d5d65c5..f64088f9ecf 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: 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 -- cgit v1.2.3