This is an archive of the discontinued LLVM Phabricator instance.

Differential D37384

[WebAssembly] Fix getSymbolValue for exported globals
ClosedPublic

Authored by sbc100 on Sep 1 2017, 10:18 AM.

Details

Reviewers
dschuff
Commits
rG4194fb706279: [WebAssembly] Fix getSymbolValue for exported globals
rL312340: [WebAssembly] Fix getSymbolValue for exported globals
Summary

The code wasn't previously taking into account that the
global index space is not same as the into in the Globals
array since the latter does not include imported globals.

This fixes the WebAssembly waterfall failures.

Diff Detail

Event Timeline

sbc100 created this revision.Sep 1 2017, 10:18 AM
Herald added subscribers: aheejin, jgravelle-google, dschuff, jfb. · View Herald TranscriptSep 1 2017, 10:18 AM
sbc100 added a reviewer: dschuff.Sep 1 2017, 10:18 AM
sbc100 added a subscriber: llvm-commits.
dschuff accepted this revision.Sep 1 2017, 10:21 AM
This revision is now accepted and ready to land.Sep 1 2017, 10:21 AM
Closed by commit rL312340: [WebAssembly] Fix getSymbolValue for exported globals (authored by sbc). · Explain WhySep 1 2017, 10:25 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
Object/
2 lines
test/
tools/
llvm-nm/
wasm/
21 lines
2 lines
4 lines

Diff 113552

lib/Object/WasmObjectFile.cpp

Show First 20 Lines • Show All 782 Lines • ▼ Show 20 Linesuint64_t WasmObjectFile::getSymbolValueImpl(DataRefImpl Symb) const {
const WasmSymbol& Sym = getWasmSymbol(Symb); const WasmSymbol& Sym = getWasmSymbol(Symb);
switch (Sym.Type) { switch (Sym.Type) {
case WasmSymbol::SymbolType::FUNCTION_IMPORT: case WasmSymbol::SymbolType::FUNCTION_IMPORT:
case WasmSymbol::SymbolType::GLOBAL_IMPORT: case WasmSymbol::SymbolType::GLOBAL_IMPORT:
return 0; return 0;
case WasmSymbol::SymbolType::FUNCTION_EXPORT: case WasmSymbol::SymbolType::FUNCTION_EXPORT:
return Exports[Sym.ElementIndex].Index; return Exports[Sym.ElementIndex].Index;
case WasmSymbol::SymbolType::GLOBAL_EXPORT: { case WasmSymbol::SymbolType::GLOBAL_EXPORT: {
uint32_t GlobalIndex = Exports[Sym.ElementIndex].Index; uint32_t GlobalIndex = Exports[Sym.ElementIndex].Index - NumImportedGlobals;
assert(GlobalIndex < Globals.size()); assert(GlobalIndex < Globals.size());
const wasm::WasmGlobal& Global = Globals[GlobalIndex]; const wasm::WasmGlobal& Global = Globals[GlobalIndex];
return Global.InitExpr.Value.Int32; return Global.InitExpr.Value.Int32;
} }
case WasmSymbol::SymbolType::DEBUG_FUNCTION_NAME: case WasmSymbol::SymbolType::DEBUG_FUNCTION_NAME:
return Sym.ElementIndex; return Sym.ElementIndex;
} }
llvm_unreachable("invalid symbol type"); llvm_unreachable("invalid symbol type");
▲ Show 20 Lines • Show All 213 Lines • Show Last 20 Lines

test/tools/llvm-nm/wasm/exports.yaml

# RUN: yaml2obj < %s | llvm-nm - | FileCheck %s # RUN: yaml2obj < %s | llvm-nm - | FileCheck -strict-whitespace %s
# That wasm exports of functions and globals are displayed as global data and # That wasm exports of functions and globals are displayed as global data and
# code symbols. # code symbols.
--- !WASM --- !WASM
FileHeader: FileHeader:
Version: 0x00000001 Version: 0x00000001
Sections: Sections:
Show All 16 Lines Globals:
InitExpr: InitExpr:
Opcode: I64_CONST Opcode: I64_CONST
Value: 64 Value: 64
- Type: I32 - Type: I32
Mutable: false Mutable: false
InitExpr: InitExpr:
Opcode: I64_CONST Opcode: I64_CONST
Value: 1024 Value: 1024
- Type: IMPORT
Imports:
- Module: env
Field: fimport
Kind: FUNCTION
SigIndex: 0
- Module: env
Field: gimport
Kind: GLOBAL
GlobalType: I32
GlobalMutable: false
- Type: EXPORT - Type: EXPORT
Exports: Exports:
- Name: foo - Name: foo
Kind: FUNCTION Kind: FUNCTION
Index: 0x00000004 Index: 0x00000004
- Name: bar - Name: bar
Kind: GLOBAL Kind: GLOBAL
Index: 0x00000002 Index: 0x00000003
# CHECK: 00000400 D bar # CHECK: 00000400 D bar
# CHECK: 00000004 T foo # CHECK-NEXT: U fimport
# CHECK-NEXT: 00000004 T foo
# CHECK-NEXT: U gimport

test/tools/llvm-nm/wasm/imports.yaml

# RUN: yaml2obj < %s | llvm-nm - | FileCheck %s # RUN: yaml2obj < %s | llvm-nm - | FileCheck -strict-whitespace %s
--- !WASM --- !WASM
FileHeader: FileHeader:
Version: 0x00000001 Version: 0x00000001
Sections: Sections:
- Type: TYPE - Type: TYPE
Signatures: Signatures:
- ReturnType: I32 - ReturnType: I32
Show All 16 Lines

test/tools/llvm-nm/wasm/weak-symbols.yaml

# RUN: yaml2obj < %s | llvm-nm - | FileCheck %s # RUN: yaml2obj < %s | llvm-nm - | FileCheck -strict-whitespace %s
# That wasm exports of functions and globals are displayed as global data and # That wasm exports of functions and globals are displayed as global data and
# code symbols. # code symbols.
--- !WASM --- !WASM
FileHeader: FileHeader:
Version: 0x00000001 Version: 0x00000001
Sections: Sections:
Show All 34 Lines Globals:
Value: 1024 Value: 1024
- Type: EXPORT - Type: EXPORT
Exports: Exports:
- Name: weak_global_func - Name: weak_global_func
Kind: FUNCTION Kind: FUNCTION
Index: 0x00000004 Index: 0x00000004
- Name: weak_global_data - Name: weak_global_data
Kind: GLOBAL Kind: GLOBAL
Index: 0x00000002 Index: 0x00000003
- Type: CUSTOM - Type: CUSTOM
Name: linking Name: linking
DataSize: 0 DataSize: 0
DataAlignment: 2 DataAlignment: 2
SymbolInfo: SymbolInfo:
- Name: weak_global_func - Name: weak_global_func
Flags: 1 Flags: 1
- Name: weak_global_data - Name: weak_global_data
Show All 10 Lines