This is an archive of the discontinued LLVM Phabricator instance.

Differential D77566

[WebAssembly] Handle event exports
ClosedPublic

Authored by aheejin on Apr 6 2020, 9:21 AM.

Details

Reviewers
sbc100
Commits
rGc09acd5dd147: [WebAssembly] Handle event exports
Summary

This handles exports of events, which was missing.

Diff Detail

Event Timeline

aheejin created this revision.Apr 6 2020, 9:21 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 6 2020, 9:21 AM
Herald added subscribers: llvm-commits, sunfish, jgravelle-google, dschuff. · View Herald Transcript
sbc100 accepted this revision.Apr 6 2020, 11:19 AM

great! thanks.

This revision is now accepted and ready to land.Apr 6 2020, 11:19 AM
Harbormaster completed remote builds in B51971: Diff 255376.Apr 6 2020, 11:25 AM
Closed by commit rGc09acd5dd147: [WebAssembly] Handle event exports (authored by aheejin). · Explain WhyApr 6 2020, 11:58 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lld/
test/
wasm/
8 lines
wasm/
3 lines

Diff 255427

lld/test/wasm/event-section.ll

; RUN: llc -filetype=obj -exception-model=wasm -mattr=+exception-handling %p/Inputs/event-section1.ll -o %t1.o ; RUN: llc -filetype=obj -exception-model=wasm -mattr=+exception-handling %p/Inputs/event-section1.ll -o %t1.o
; RUN: llc -filetype=obj -exception-model=wasm -mattr=+exception-handling %p/Inputs/event-section2.ll -o %t2.o ; RUN: llc -filetype=obj -exception-model=wasm -mattr=+exception-handling %p/Inputs/event-section2.ll -o %t2.o
; RUN: llc -filetype=obj -exception-model=wasm -mattr=+exception-handling %s -o %t.o ; RUN: llc -filetype=obj -exception-model=wasm -mattr=+exception-handling %s -o %t.o
; RUN: wasm-ld -o %t.wasm %t.o %t1.o %t2.o ; RUN: wasm-ld -o %t.wasm %t.o %t1.o %t2.o
; RUN: wasm-ld --export-all -o %t-export-all.wasm %t.o %t1.o %t2.o
; RUN: obj2yaml %t.wasm | FileCheck %s ; RUN: obj2yaml %t.wasm | FileCheck %s
; RUN: obj2yaml %t-export-all.wasm | FileCheck %s --check-prefix=EXPORT-ALL
target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128" target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
target triple = "wasm32-unknown-unknown" target triple = "wasm32-unknown-unknown"
declare void @foo(i8*) declare void @foo(i8*)
declare void @bar(i8*) declare void @bar(i8*)
define void @_start() { define void @_start() {
Show All 16 Lines
; CHECK: - Type: EVENT ; CHECK: - Type: EVENT
; CHECK-NEXT: Events: ; CHECK-NEXT: Events:
; CHECK-NEXT: - Index: 0 ; CHECK-NEXT: - Index: 0
; CHECK-NEXT: Attribute: 0 ; CHECK-NEXT: Attribute: 0
; CHECK-NEXT: SigIndex: 1 ; CHECK-NEXT: SigIndex: 1
; Global section has to come after event section ; Global section has to come after event section
; CHECK: - Type: GLOBAL ; CHECK: - Type: GLOBAL
; EXPORT-ALL: - Type: EXPORT
; EXPORT-ALL-NEXT Exports:
; EXPORT-ALL: - Name: __cpp_exception
; EXPORT-ALL: Kind: EVENT
; EXPORT-ALL: Index: 0

lld/wasm/WriterUtils.cpp

Show First 20 Lines • Show All 211 Lines • ▼ Show 20 Linesvoid writeExport(raw_ostream &os, const WasmExport &export_) {
writeU8(os, export_.Kind, "export kind"); writeU8(os, export_.Kind, "export kind");
switch (export_.Kind) { switch (export_.Kind) {
case WASM_EXTERNAL_FUNCTION: case WASM_EXTERNAL_FUNCTION:
writeUleb128(os, export_.Index, "function index"); writeUleb128(os, export_.Index, "function index");
break; break;
case WASM_EXTERNAL_GLOBAL: case WASM_EXTERNAL_GLOBAL:
writeUleb128(os, export_.Index, "global index"); writeUleb128(os, export_.Index, "global index");
break; break;
case WASM_EXTERNAL_EVENT:
writeUleb128(os, export_.Index, "event index");
break;
case WASM_EXTERNAL_MEMORY: case WASM_EXTERNAL_MEMORY:
writeUleb128(os, export_.Index, "memory index"); writeUleb128(os, export_.Index, "memory index");
break; break;
case WASM_EXTERNAL_TABLE: case WASM_EXTERNAL_TABLE:
writeUleb128(os, export_.Index, "table index"); writeUleb128(os, export_.Index, "table index");
break; break;
default: default:
fatal("unsupported export type: " + Twine(export_.Kind)); fatal("unsupported export type: " + Twine(export_.Kind));
} }
} }
} // namespace wasm } // namespace wasm
} // namespace lld } // namespace lld