This is an archive of the discontinued LLVM Phabricator instance.

Differential D38111

[WebAssembly] Weak symbols should be defined in SF_Global
ClosedPublic

Authored by sbc100 on Sep 20 2017, 4:39 PM.

Details

Reviewers
dschuff
Commits
rG79cd5d0080b8: [WebAssembly] Weak symbols should be defined in SF_Global
rL313838: [WebAssembly] Weak symbols should be defined in SF_Global
Summary

This manifested itself in lld since it meant that weak
symbols were not appearing in archive symbol tables.

Diff Detail

Repository
rL LLVM

Event Timeline

sbc100 created this revision.Sep 20 2017, 4:39 PM
Herald added subscribers: aheejin, jgravelle-google, dschuff, jfb. · View Herald TranscriptSep 20 2017, 4:39 PM
sbc100 added a reviewer: dschuff.Sep 20 2017, 4:40 PM
sbc100 added a subscriber: llvm-commits.
Closed by commit rL313838: [WebAssembly] Weak symbols should be defined in SF_Global (authored by sbc). · Explain WhySep 20 2017, 4:41 PM
This revision was automatically updated to reflect the committed changes.
dschuff edited edge metadata.Sep 20 2017, 4:55 PM

retro-LGTM

Revision Contents

PathSize
llvm/
trunk/
lib/
Object/
2 lines
test/
MC/
WebAssembly/
15 lines

Diff 116115

llvm/trunk/lib/Object/WasmObjectFile.cpp

Show First 20 Lines • Show All 763 Lines • ▼ Show 20 Lines
uint32_t WasmObjectFile::getSymbolFlags(DataRefImpl Symb) const { uint32_t WasmObjectFile::getSymbolFlags(DataRefImpl Symb) const {
uint32_t Result = SymbolRef::SF_None; uint32_t Result = SymbolRef::SF_None;
const WasmSymbol &Sym = getWasmSymbol(Symb); const WasmSymbol &Sym = getWasmSymbol(Symb);
DEBUG(dbgs() << "getSymbolFlags: ptr=" << &Sym << " " << Sym << "\n"); DEBUG(dbgs() << "getSymbolFlags: ptr=" << &Sym << " " << Sym << "\n");
if (Sym.isWeak()) if (Sym.isWeak())
Result |= SymbolRef::SF_Weak; Result |= SymbolRef::SF_Weak;
else if (Sym.isGlobal()) if (!Sym.isLocal())
Result |= SymbolRef::SF_Global; Result |= SymbolRef::SF_Global;
switch (Sym.Type) { switch (Sym.Type) {
case WasmSymbol::SymbolType::FUNCTION_IMPORT: case WasmSymbol::SymbolType::FUNCTION_IMPORT:
Result |= SymbolRef::SF_Undefined | SymbolRef::SF_Executable; Result |= SymbolRef::SF_Undefined | SymbolRef::SF_Executable;
break; break;
case WasmSymbol::SymbolType::FUNCTION_EXPORT: case WasmSymbol::SymbolType::FUNCTION_EXPORT:
Result |= SymbolRef::SF_Executable; Result |= SymbolRef::SF_Executable;
▲ Show 20 Lines • Show All 279 Lines • Show Last 20 Lines

llvm/trunk/test/MC/WebAssembly/weak-alias.ll

; RUN: llc -mtriple wasm32-unknown-unknown-wasm -filetype=obj %s -o - | obj2yaml | FileCheck %s ; RUN: llc -mtriple wasm32-unknown-unknown-wasm -filetype=obj %s -o %t.o
; RUN: obj2yaml %t.o | FileCheck %s
; RUN: llvm-objdump -t %t.o | FileCheck --check-prefix=CHECK-SYMS %s
; 'foo_alias()' is weak alias of function 'foo()' ; 'foo_alias()' is weak alias of function 'foo()'
; 'bar_alias' is weak alias of global variable 'bar' ; 'bar_alias' is weak alias of global variable 'bar'
; Generates two exports of the same function, one of them weak ; Generates two exports of the same function, one of them weak
@bar = global i32 7, align 8 @bar = global i32 7, align 8
@bar_alias = weak hidden alias i32, i32* @bar @bar_alias = weak hidden alias i32, i32* @bar
@bar_alias_address = global i32* @bar_alias, align 8 @bar_alias_address = global i32* @bar_alias, align 8
▲ Show 20 Lines • Show All 92 Lines • ▼ Show 20 Lines
; CHECK-NEXT: - Name: bar_alias ; CHECK-NEXT: - Name: bar_alias
; CHECK-NEXT: Flags: 1 ; CHECK-NEXT: Flags: 1
; CHECK-NEXT: SegmentNames: ; CHECK-NEXT: SegmentNames:
; CHECK-NEXT: - Index: 0 ; CHECK-NEXT: - Index: 0
; CHECK-NEXT: Name: .data.bar ; CHECK-NEXT: Name: .data.bar
; CHECK-NEXT: - Index: 1 ; CHECK-NEXT: - Index: 1
; CHECK-NEXT: Name: .data.bar_alias_address ; CHECK-NEXT: Name: .data.bar_alias_address
; CHECK-NEXT: ... ; CHECK-NEXT: ...
; CHECK-SYMS: SYMBOL TABLE:
; CHECK-SYMS-NEXT: 00000000 g F name foo_alias
; CHECK-SYMS-NEXT: 00000001 g F name call_alias
; CHECK-SYMS-NEXT: 00000002 g F name foo
; CHECK-SYMS-NEXT: 00000002 gw F EXPORT foo_alias
; CHECK-SYMS-NEXT: 00000000 gw EXPORT bar_alias
; CHECK-SYMS-NEXT: 00000001 g F EXPORT call_alias
; CHECK-SYMS-NEXT: 00000002 g F EXPORT foo
; CHECK-SYMS-NEXT: 00000000 g EXPORT bar
; CHECK-SYMS-NEXT: 00000008 g EXPORT bar_alias_address