This is an archive of the discontinued LLVM Phabricator instance.

Differential D72881

[lld][WebAssembly] Use a more meaningful name for stub functions
ClosedPublic

Authored by sbc100 on Jan 16 2020, 2:41 PM.

Details

Reviewers
ruiu
dschuff
Commits
rG51b521c07a7a: [lld][WebAssembly] Use a more meaningful name for stub functions
Summary

When we generate these stub functions on signature mismatches give
them a more meaningful name so that when people see this in stack
traces is givesa clue as the what is going on.

See: https://github.com/emscripten-core/emscripten/issues/10226

Diff Detail

Event Timeline

sbc100 created this revision.Jan 16 2020, 2:41 PM
Herald added a project: Restricted Project. · View Herald TranscriptJan 16 2020, 2:41 PM
Herald added subscribers: llvm-commits, sunfish, aheejin and 2 others. · View Herald Transcript
sbc100 added a reviewer: ruiu.Jan 16 2020, 2:41 PM
dschuff accepted this revision.Jan 16 2020, 2:46 PM
This revision is now accepted and ready to land.Jan 16 2020, 2:46 PM
Closed by commit rG51b521c07a7a: [lld][WebAssembly] Use a more meaningful name for stub functions (authored by sbc100). · Explain WhyJan 16 2020, 3:03 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lld/
test/
wasm/
2 lines
2 lines
wasm/
2 lines

Diff 238625

lld/test/wasm/signature-mismatch-export.ll

Show All 16 Lines
; CHECK: - Name: ret32 ; CHECK: - Name: ret32
; CHECK-NEXT: Kind: FUNCTION ; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 2 ; CHECK-NEXT: Index: 2
; CHECK: - Type: CUSTOM ; CHECK: - Type: CUSTOM
; CHECK-NEXT: Name: name ; CHECK-NEXT: Name: name
; CHECK-NEXT: FunctionNames: ; CHECK-NEXT: FunctionNames:
; CHECK-NEXT: - Index: 0 ; CHECK-NEXT: - Index: 0
; CHECK-NEXT: Name: 'unreachable:ret32' ; CHECK-NEXT: Name: 'signature_mismatch:ret32'
; CHECK-NEXT: - Index: 1 ; CHECK-NEXT: - Index: 1
; CHECK-NEXT: Name: _start ; CHECK-NEXT: Name: _start
; CHECK-NEXT: - Index: 2 ; CHECK-NEXT: - Index: 2
; CHECK-NEXT: Name: ret32 ; CHECK-NEXT: Name: ret32
; CHECK-NEXT: ... ; CHECK-NEXT: ...

lld/test/wasm/signature-mismatch.ll

Show All 34 Lines
; YAML-NEXT: - Name: call_ret32 ; YAML-NEXT: - Name: call_ret32
; YAML-NEXT: Kind: FUNCTION ; YAML-NEXT: Kind: FUNCTION
; YAML-NEXT: Index: 3 ; YAML-NEXT: Index: 3
; YAML: - Type: CUSTOM ; YAML: - Type: CUSTOM
; YAML-NEXT: Name: name ; YAML-NEXT: Name: name
; YAML-NEXT: FunctionNames: ; YAML-NEXT: FunctionNames:
; YAML-NEXT: - Index: 0 ; YAML-NEXT: - Index: 0
; YAML-NEXT: Name: 'unreachable:ret32' ; YAML-NEXT: Name: 'signature_mismatch:ret32'
; YAML-NEXT: - Index: 1 ; YAML-NEXT: - Index: 1
; YAML-NEXT: Name: _start ; YAML-NEXT: Name: _start
; YAML-NEXT: - Index: 2 ; YAML-NEXT: - Index: 2
; YAML-NEXT: Name: ret32 ; YAML-NEXT: Name: ret32
; YAML-NEXT: - Index: 3 ; YAML-NEXT: - Index: 3
; YAML-NEXT: Name: call_ret32 ; YAML-NEXT: Name: call_ret32
; YAML-NEXT: ... ; YAML-NEXT: ...

lld/wasm/SymbolTable.cpp

Show First 20 Lines • Show All 713 Lines • ▼ Show 20 Lines if (!defined) {
cast<FunctionSymbol>(variants[1]), true); cast<FunctionSymbol>(variants[1]), true);
return; return;
} }
for (auto *symbol : variants) { for (auto *symbol : variants) {
if (symbol != defined) { if (symbol != defined) {
auto *f = cast<FunctionSymbol>(symbol); auto *f = cast<FunctionSymbol>(symbol);
reportFunctionSignatureMismatch(symName, f, defined, false); reportFunctionSignatureMismatch(symName, f, defined, false);
StringRef debugName = saver.save("unreachable:" + toString(*f)); StringRef debugName = saver.save("signature_mismatch:" + toString(*f));
replaceWithUnreachable(f, *f->signature, debugName); replaceWithUnreachable(f, *f->signature, debugName);
} }
} }
} }
} }
} // namespace wasm } // namespace wasm
} // namespace lld } // namespace lld