[WebAssembly] Honor WASM_SYMBOL_EXPORT symbol flag

This flag means that symbol should be exported in the final binary.

The reason for this change is to allow source level annotations to
trigger a given symbol to be exported:
https://github.com/emscripten-core/emscripten/issues/7702

Differential Revision: https://reviews.llvm.org/D57869

llvm-svn: 353364
This commit is contained in:
Sam Clegg 2019-02-07 01:53:50 +00:00
parent 92369dcffd
commit af3b9d0570
2 changed files with 23 additions and 2 deletions

View File

@ -3,13 +3,29 @@
; RUN: wasm-ld --export=hidden_function -o %t.wasm %t.o ; RUN: wasm-ld --export=hidden_function -o %t.wasm %t.o
; RUN: obj2yaml %t.wasm | FileCheck %s ; RUN: obj2yaml %t.wasm | FileCheck %s
@llvm.used = appending global [1 x i8*] [i8* bitcast (i32 ()* @used_function to i8*)], section "llvm.metadata"
target triple = "wasm32-unknown-unknown" target triple = "wasm32-unknown-unknown"
; Not exported by default, but forced via commandline
define hidden i32 @hidden_function() local_unnamed_addr { define hidden i32 @hidden_function() local_unnamed_addr {
entry: entry:
ret i32 0 ret i32 0
} }
; Not exported by default
define i32 @default_function() local_unnamed_addr {
entry:
ret i32 0
}
; Exported because its part of llvm.used
define i32 @used_function() local_unnamed_addr {
entry:
ret i32 0
}
; Exported by default
define void @_start() local_unnamed_addr { define void @_start() local_unnamed_addr {
entry: entry:
ret void ret void
@ -17,6 +33,8 @@ entry:
; CHECK-ERROR: error: symbol exported via --export not found: missing ; CHECK-ERROR: error: symbol exported via --export not found: missing
; CHECK-NOT: - Name: default_function
; CHECK: - Type: EXPORT ; CHECK: - Type: EXPORT
; CHECK-NEXT: Exports: ; CHECK-NEXT: Exports:
; CHECK-NEXT: - Name: memory ; CHECK-NEXT: - Name: memory
@ -31,7 +49,10 @@ entry:
; CHECK-NEXT: - Name: hidden_function ; CHECK-NEXT: - Name: hidden_function
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Index: 1
; CHECK-NEXT: - Name: _start ; CHECK-NEXT: - Name: used_function
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 2 ; CHECK-NEXT: Index: 2
; CHECK-NEXT: - Name: _start
; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 3
; CHECK-NEXT: - Type: CODE ; CHECK-NEXT: - Type: CODE

View File

@ -116,7 +116,7 @@ bool Symbol::isExported() const {
if (Config->ExportDynamic && !isHidden()) if (Config->ExportDynamic && !isHidden())
return true; return true;
return false; return Flags & WASM_SYMBOL_EXPORTED;
} }
uint32_t FunctionSymbol::getFunctionIndex() const { uint32_t FunctionSymbol::getFunctionIndex() const {