This is an archive of the discontinued LLVM Phabricator instance.

Differential D43930

[WebAssembly] Export all defined data symbols with a "fake global"
ClosedPublic

Authored by ncw on Mar 1 2018, 1:53 AM.

Details

Reviewers
sbc100
Commits
rGf2f6d5e03b3f: [WebAssembly] Export non-hidden defined data symbols via wasm globals
rL326581: [WebAssembly] Export non-hidden defined data symbols via wasm globals
rLLD326581: [WebAssembly] Export non-hidden defined data symbols via wasm globals
Summary

This fixes a TODO introduced in rLLD325861.

Diff Detail

Event Timeline

ncw created this revision.Mar 1 2018, 1:53 AM
Herald added subscribers: llvm-commits, sunfish, aheejin and 3 others. · View Herald TranscriptMar 1 2018, 1:53 AM
sbc100 accepted this revision.Mar 1 2018, 8:13 AM

How about: "[WebAssembly] Export non-hidden data symbols via wasm globals"

This revision is now accepted and ready to land.Mar 1 2018, 8:13 AM
sbc100 added a child revision: D43963: [WebAssembly] Simplify writing of exports section. NFC..Mar 1 2018, 12:49 PM
Closed by commit rLLD326581: [WebAssembly] Export non-hidden defined data symbols via wasm globals (authored by ncw). · Explain WhyMar 2 2018, 6:54 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
test/
wasm/
11 lines
9 lines
9 lines
18 lines
9 lines
wasm/
8 lines

Diff 136477

test/wasm/call-indirect.ll

Show First 20 Lines • Show All 79 Lines • ▼ Show 20 Lines
; CHECK-NEXT: Type: I32 ; CHECK-NEXT: Type: I32
; CHECK-NEXT: Mutable: false ; CHECK-NEXT: Mutable: false
; CHECK-NEXT: InitExpr: ; CHECK-NEXT: InitExpr:
; CHECK-NEXT: Opcode: I32_CONST ; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 66576 ; CHECK-NEXT: Value: 66576
; CHECK-NEXT: - Index: 2 ; CHECK-NEXT: - Index: 2
; CHECK-NEXT: Type: I32 ; CHECK-NEXT: Type: I32
; CHECK-NEXT: Mutable: false ; CHECK-NEXT: Mutable: false
; CHECK-NEXT: InitExpr: ; CHECK-NEXT: InitExpr:
; CHECK-NEXT: Opcode: I32_CONST ; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 1036 ; CHECK-NEXT: Value: 1036
; CHECK-NEXT: - Index: 3
; CHECK-NEXT: Type: I32
; CHECK-NEXT: Mutable: false
; CHECK-NEXT: InitExpr:
; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 1032
; CHECK-NEXT: - Type: EXPORT ; CHECK-NEXT: - Type: EXPORT
; CHECK-NEXT: Exports: ; CHECK-NEXT: Exports:
; CHECK-NEXT: - Name: memory ; CHECK-NEXT: - Name: memory
; CHECK-NEXT: Kind: MEMORY ; CHECK-NEXT: Kind: MEMORY
; CHECK-NEXT: Index: 0 ; CHECK-NEXT: Index: 0
; CHECK-NEXT: - Name: __heap_base ; CHECK-NEXT: - Name: __heap_base
; CHECK-NEXT: Kind: GLOBAL ; CHECK-NEXT: Kind: GLOBAL
; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Index: 1
; CHECK-NEXT: - Name: __data_end ; CHECK-NEXT: - Name: __data_end
; CHECK-NEXT: Kind: GLOBAL ; CHECK-NEXT: Kind: GLOBAL
; CHECK-NEXT: Index: 2 ; CHECK-NEXT: Index: 2
; CHECK-NEXT: - Name: _start ; CHECK-NEXT: - Name: _start
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 3 ; CHECK-NEXT: Index: 3
; CHECK-NEXT: - Name: bar ; CHECK-NEXT: - Name: bar
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 0 ; CHECK-NEXT: Index: 0
; CHECK-NEXT: - Name: call_bar_indirect ; CHECK-NEXT: - Name: call_bar_indirect
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Index: 1
; CHECK-NEXT: - Name: foo ; CHECK-NEXT: - Name: foo
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 2 ; CHECK-NEXT: Index: 2
; CHECK-NEXT: - Name: indirect_func
; CHECK-NEXT: Kind: GLOBAL
; CHECK-NEXT: Index: 3
; CHECK-NEXT: - Name: call_ptr ; CHECK-NEXT: - Name: call_ptr
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 4 ; CHECK-NEXT: Index: 4
; CHECK-NEXT: - Type: ELEM ; CHECK-NEXT: - Type: ELEM
; CHECK-NEXT: Segments: ; CHECK-NEXT: Segments:
; CHECK-NEXT: - Offset: ; CHECK-NEXT: - Offset:
; CHECK-NEXT: Opcode: I32_CONST ; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 1 ; CHECK-NEXT: Value: 1
▲ Show 20 Lines • Show All 42 Lines • Show Last 20 Lines

test/wasm/comdats.ll

Show All 28 Lines
; CHECK-NEXT: Opcode: I32_CONST ; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 66576 ; CHECK-NEXT: Value: 66576
; CHECK-NEXT: - Index: 2 ; CHECK-NEXT: - Index: 2
; CHECK-NEXT: Type: I32 ; CHECK-NEXT: Type: I32
; CHECK-NEXT: Mutable: false ; CHECK-NEXT: Mutable: false
; CHECK-NEXT: InitExpr: ; CHECK-NEXT: InitExpr:
; CHECK-NEXT: Opcode: I32_CONST ; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 1027 ; CHECK-NEXT: Value: 1027
; CHECK-NEXT: - Index: 3
; CHECK-NEXT: Type: I32
; CHECK-NEXT: Mutable: false
; CHECK-NEXT: InitExpr:
; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 1024
; CHECK-NEXT: - Type: EXPORT ; CHECK-NEXT: - Type: EXPORT
; CHECK-NEXT: Exports: ; CHECK-NEXT: Exports:
; CHECK-NEXT: - Name: memory ; CHECK-NEXT: - Name: memory
; CHECK-NEXT: Kind: MEMORY ; CHECK-NEXT: Kind: MEMORY
; CHECK-NEXT: Index: 0 ; CHECK-NEXT: Index: 0
; CHECK-NEXT: - Name: __heap_base ; CHECK-NEXT: - Name: __heap_base
; CHECK-NEXT: Kind: GLOBAL ; CHECK-NEXT: Kind: GLOBAL
; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Index: 1
; CHECK-NEXT: - Name: __data_end ; CHECK-NEXT: - Name: __data_end
; CHECK-NEXT: Kind: GLOBAL ; CHECK-NEXT: Kind: GLOBAL
; CHECK-NEXT: Index: 2 ; CHECK-NEXT: Index: 2
; CHECK-NEXT: - Name: _start ; CHECK-NEXT: - Name: _start
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 0 ; CHECK-NEXT: Index: 0
; CHECK-NEXT: - Name: inlineFn ; CHECK-NEXT: - Name: inlineFn
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Index: 1
; CHECK-NEXT: - Name: constantData
; CHECK-NEXT: Kind: GLOBAL
; CHECK-NEXT: Index: 3
; CHECK-NEXT: - Name: callInline1 ; CHECK-NEXT: - Name: callInline1
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 2 ; CHECK-NEXT: Index: 2
; CHECK-NEXT: - Name: callInline2 ; CHECK-NEXT: - Name: callInline2
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 3 ; CHECK-NEXT: Index: 3
; CHECK-NEXT: - Type: ELEM ; CHECK-NEXT: - Type: ELEM
; CHECK-NEXT: Segments: ; CHECK-NEXT: Segments:
Show All 29 Lines

test/wasm/local-symbols.ll

Show First 20 Lines • Show All 57 Lines • ▼ Show 20 Lines
; CHECK-NEXT: Opcode: I32_CONST ; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 66576 ; CHECK-NEXT: Value: 66576
; CHECK-NEXT: - Index: 2 ; CHECK-NEXT: - Index: 2
; CHECK-NEXT: Type: I32 ; CHECK-NEXT: Type: I32
; CHECK-NEXT: Mutable: false ; CHECK-NEXT: Mutable: false
; CHECK-NEXT: InitExpr: ; CHECK-NEXT: InitExpr:
; CHECK-NEXT: Opcode: I32_CONST ; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 1032 ; CHECK-NEXT: Value: 1032
; CHECK-NEXT: - Index: 3
; CHECK-NEXT: Type: I32
; CHECK-NEXT: Mutable: false
; CHECK-NEXT: InitExpr:
; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 1024
; CHECK-NEXT: - Type: EXPORT ; CHECK-NEXT: - Type: EXPORT
; CHECK-NEXT: Exports: ; CHECK-NEXT: Exports:
; CHECK-NEXT: - Name: memory ; CHECK-NEXT: - Name: memory
; CHECK-NEXT: Kind: MEMORY ; CHECK-NEXT: Kind: MEMORY
; CHECK-NEXT: Index: 0 ; CHECK-NEXT: Index: 0
; CHECK-NEXT: - Name: __heap_base ; CHECK-NEXT: - Name: __heap_base
; CHECK-NEXT: Kind: GLOBAL ; CHECK-NEXT: Kind: GLOBAL
; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Index: 1
; CHECK-NEXT: - Name: __data_end ; CHECK-NEXT: - Name: __data_end
; CHECK-NEXT: Kind: GLOBAL ; CHECK-NEXT: Kind: GLOBAL
; CHECK-NEXT: Index: 2 ; CHECK-NEXT: Index: 2
; CHECK-NEXT: - Name: _start ; CHECK-NEXT: - Name: _start
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Index: 1
; CHECK-NEXT: - Name: foo
; CHECK-NEXT: Kind: GLOBAL
; CHECK-NEXT: Index: 3
; CHECK-NEXT: - Type: CODE ; CHECK-NEXT: - Type: CODE
; CHECK-NEXT: Functions: ; CHECK-NEXT: Functions:
; CHECK-NEXT: - Index: 0 ; CHECK-NEXT: - Index: 0
; CHECK-NEXT: Locals: ; CHECK-NEXT: Locals:
; CHECK-NEXT: Body: 4100280284888080000B ; CHECK-NEXT: Body: 4100280284888080000B
; CHECK-NEXT: - Index: 1 ; CHECK-NEXT: - Index: 1
; CHECK-NEXT: Locals: ; CHECK-NEXT: Locals:
; CHECK-NEXT: Body: 1080808080001A0B ; CHECK-NEXT: Body: 1080808080001A0B
Show All 21 Lines

test/wasm/locals-duplicate.test

Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Lines
; CHECK-NEXT: Opcode: I32_CONST ; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 66592 ; CHECK-NEXT: Value: 66592
; CHECK-NEXT: - Index: 2 ; CHECK-NEXT: - Index: 2
; CHECK-NEXT: Type: I32 ; CHECK-NEXT: Type: I32
; CHECK-NEXT: Mutable: false ; CHECK-NEXT: Mutable: false
; CHECK-NEXT: InitExpr: ; CHECK-NEXT: InitExpr:
; CHECK-NEXT: Opcode: I32_CONST ; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 1048 ; CHECK-NEXT: Value: 1048
; CHECK-NEXT: - Index: 3
; CHECK-NEXT: Type: I32
; CHECK-NEXT: Mutable: false
; CHECK-NEXT: InitExpr:
; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 1028
; CHECK-NEXT: - Index: 4
; CHECK-NEXT: Type: I32
; CHECK-NEXT: Mutable: false
; CHECK-NEXT: InitExpr:
; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 1036
; CHECK-NEXT: - Type: EXPORT ; CHECK-NEXT: - Type: EXPORT
; CHECK-NEXT: Exports: ; CHECK-NEXT: Exports:
; CHECK-NEXT: - Name: memory ; CHECK-NEXT: - Name: memory
; CHECK-NEXT: Kind: MEMORY ; CHECK-NEXT: Kind: MEMORY
; CHECK-NEXT: Index: 0 ; CHECK-NEXT: Index: 0
; CHECK-NEXT: - Name: __heap_base ; CHECK-NEXT: - Name: __heap_base
; CHECK-NEXT: Kind: GLOBAL ; CHECK-NEXT: Kind: GLOBAL
; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Index: 1
; CHECK-NEXT: - Name: __data_end ; CHECK-NEXT: - Name: __data_end
; CHECK-NEXT: Kind: GLOBAL ; CHECK-NEXT: Kind: GLOBAL
; CHECK-NEXT: Index: 2 ; CHECK-NEXT: Index: 2
; CHECK-NEXT: - Name: colliding_func2 ; CHECK-NEXT: - Name: colliding_func2
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Index: 1
; CHECK-NEXT: - Name: get_global1A ; CHECK-NEXT: - Name: get_global1A
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 3 ; CHECK-NEXT: Index: 3
; CHECK-NEXT: - Name: get_global2A ; CHECK-NEXT: - Name: get_global2A
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 4 ; CHECK-NEXT: Index: 4
; CHECK-NEXT: - Name: colliding_global2
; CHECK-NEXT: Kind: GLOBAL
; CHECK-NEXT: Index: 3
; CHECK-NEXT: - Name: get_global3A ; CHECK-NEXT: - Name: get_global3A
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 5 ; CHECK-NEXT: Index: 5
; CHECK-NEXT: - Name: get_func1A ; CHECK-NEXT: - Name: get_func1A
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 6 ; CHECK-NEXT: Index: 6
; CHECK-NEXT: - Name: get_func2A ; CHECK-NEXT: - Name: get_func2A
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 7 ; CHECK-NEXT: Index: 7
; CHECK-NEXT: - Name: get_func3A ; CHECK-NEXT: - Name: get_func3A
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 8 ; CHECK-NEXT: Index: 8
; CHECK-NEXT: - Name: colliding_func1 ; CHECK-NEXT: - Name: colliding_func1
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 9 ; CHECK-NEXT: Index: 9
; CHECK-NEXT: - Name: get_global1B ; CHECK-NEXT: - Name: get_global1B
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 12 ; CHECK-NEXT: Index: 12
; CHECK-NEXT: - Name: colliding_global1
; CHECK-NEXT: Kind: GLOBAL
; CHECK-NEXT: Index: 4
; CHECK-NEXT: - Name: get_global2B ; CHECK-NEXT: - Name: get_global2B
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 13 ; CHECK-NEXT: Index: 13
; CHECK-NEXT: - Name: get_global3B ; CHECK-NEXT: - Name: get_global3B
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 14 ; CHECK-NEXT: Index: 14
; CHECK-NEXT: - Name: get_func1B ; CHECK-NEXT: - Name: get_func1B
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
▲ Show 20 Lines • Show All 453 Lines • Show Last 20 Lines

test/wasm/weak-symbols.ll

Show First 20 Lines • Show All 54 Lines • ▼ Show 20 Lines
; CHECK-NEXT: Opcode: I32_CONST ; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 66576 ; CHECK-NEXT: Value: 66576
; CHECK-NEXT: - Index: 2 ; CHECK-NEXT: - Index: 2
; CHECK-NEXT: Type: I32 ; CHECK-NEXT: Type: I32
; CHECK-NEXT: Mutable: false ; CHECK-NEXT: Mutable: false
; CHECK-NEXT: InitExpr: ; CHECK-NEXT: InitExpr:
; CHECK-NEXT: Opcode: I32_CONST ; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 1032 ; CHECK-NEXT: Value: 1032
; CHECK-NEXT: - Index: 3
; CHECK-NEXT: Type: I32
; CHECK-NEXT: Mutable: false
; CHECK-NEXT: InitExpr:
; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 1024
; CHECK-NEXT: - Type: EXPORT ; CHECK-NEXT: - Type: EXPORT
; CHECK-NEXT: Exports: ; CHECK-NEXT: Exports:
; CHECK-NEXT: - Name: memory ; CHECK-NEXT: - Name: memory
; CHECK-NEXT: Kind: MEMORY ; CHECK-NEXT: Kind: MEMORY
; CHECK-NEXT: Index: 0 ; CHECK-NEXT: Index: 0
; CHECK-NEXT: - Name: __heap_base ; CHECK-NEXT: - Name: __heap_base
; CHECK-NEXT: Kind: GLOBAL ; CHECK-NEXT: Kind: GLOBAL
; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Index: 1
; CHECK-NEXT: - Name: __data_end ; CHECK-NEXT: - Name: __data_end
; CHECK-NEXT: Kind: GLOBAL ; CHECK-NEXT: Kind: GLOBAL
; CHECK-NEXT: Index: 2 ; CHECK-NEXT: Index: 2
; CHECK-NEXT: - Name: _start ; CHECK-NEXT: - Name: _start
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 0 ; CHECK-NEXT: Index: 0
; CHECK-NEXT: - Name: weakFn ; CHECK-NEXT: - Name: weakFn
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Index: 1
; CHECK-NEXT: - Name: exportWeak1 ; CHECK-NEXT: - Name: exportWeak1
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 2 ; CHECK-NEXT: Index: 2
; CHECK-NEXT: - Name: weakGlobal
; CHECK-NEXT: Kind: GLOBAL
; CHECK-NEXT: Index: 3
; CHECK-NEXT: - Name: exportWeak2 ; CHECK-NEXT: - Name: exportWeak2
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 4 ; CHECK-NEXT: Index: 4
; CHECK-NEXT: - Type: ELEM ; CHECK-NEXT: - Type: ELEM
; CHECK-NEXT: Segments: ; CHECK-NEXT: Segments:
; CHECK-NEXT: - Offset: ; CHECK-NEXT: - Offset:
; CHECK-NEXT: Opcode: I32_CONST ; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 1 ; CHECK-NEXT: Value: 1
▲ Show 20 Lines • Show All 45 Lines • Show Last 20 Lines

wasm/Writer.cpp

Show First 20 Lines • Show All 673 Lines • ▼ Show 20 Lines if (!Sym->isDefined())
continue; continue;
if (Sym->isHidden() || Sym->isLocal()) if (Sym->isHidden() || Sym->isLocal())
continue; continue;
if (!Sym->isLive()) if (!Sym->isLive())
continue; continue;
DEBUG(dbgs() << "exporting sym: " << Sym->getName() << "\n"); DEBUG(dbgs() << "exporting sym: " << Sym->getName() << "\n");
if (auto *D = dyn_cast<DefinedData>(Sym)) { if (auto *D = dyn_cast<DefinedData>(Sym))
// TODO Remove this check here; for non-relocatable output we actually
// used only to create fake-global exports for the synthetic symbols. Fix
// this in a future commit
if (Sym != WasmSym::DataEnd && Sym != WasmSym::HeapBase)
continue;
DefinedFakeGlobals.emplace_back(D); DefinedFakeGlobals.emplace_back(D);
}
ExportedSymbols.emplace_back(Sym); ExportedSymbols.emplace_back(Sym);
} }
} }
void Writer::assignSymtab() { void Writer::assignSymtab() {
if (!Config->Relocatable) if (!Config->Relocatable)
return; return;
▲ Show 20 Lines • Show All 285 Lines • Show Last 20 Lines