[lld] 0e8f4ce - [lld][WebAssembly] Fix crash on undefined+weak function syms in LTO objects

[Sam Clegg via llvm-commits]

Author: Sam Clegg
Date: 2022-05-27T11:41:34-07:00
New Revision: 0e8f4ce31df192d188239575839d8cceb47caf85

URL: https://github.com/llvm/llvm-project/commit/0e8f4ce31df192d188239575839d8cceb47caf85
DIFF: https://github.com/llvm/llvm-project/commit/0e8f4ce31df192d188239575839d8cceb47caf85.diff

LOG: [lld][WebAssembly] Fix crash on undefined+weak function syms in LTO objects

Symbols from LTO objects don't contain Wasm signatures, but we need a
signature when we create undefined/stub functions for missing weakly
undefined symbols.

Luckily, after LTO, we know that symbols that are not referenced by a
regular object file must not be needed in the final output so there
is no need to generate undefined/stub function for them.

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

Added: 
    

Modified: 
    lld/test/wasm/lto/weak-undefined.ll
    lld/wasm/SymbolTable.cpp

Removed: 
    


################################################################################
diff  --git a/lld/test/wasm/lto/weak-undefined.ll b/lld/test/wasm/lto/weak-undefined.ll
index 36e422896f35..9a42c2bb5dbf 100644
--- a/lld/test/wasm/lto/weak-undefined.ll
+++ b/lld/test/wasm/lto/weak-undefined.ll
@@ -11,6 +11,17 @@ target triple = "wasm32-unknown-unknown"
 
 declare extern_weak i32 @foo()
 
+declare extern_weak i32 @bar()
+
+; The reference to bar here will exist in the LTO file, but the LTO process will
+; remove it, so it will never be referenced by an normal object file, and
+; therefore never have a signature.
+define void @unused_function() #0 {
+entry:
+    %call2 = call i32 @bar()
+    ret void
+}
+
 define void @_start() #0 {
 entry:
     %call2 = call i32 @foo()

diff  --git a/lld/wasm/SymbolTable.cpp b/lld/wasm/SymbolTable.cpp
index ef1402248eec..2969d99e3ab9 100644
--- a/lld/wasm/SymbolTable.cpp
+++ b/lld/wasm/SymbolTable.cpp
@@ -854,7 +854,7 @@ void SymbolTable::replaceWithUndefined(Symbol *sym) {
 // the call instruction that passes Wasm validation.
 void SymbolTable::handleWeakUndefines() {
   for (Symbol *sym : getSymbols()) {
-    if (sym->isUndefWeak()) {
+    if (sym->isUndefWeak() && sym->isUsedInRegularObj) {
       if (sym->getSignature()) {
         replaceWithUndefined(sym);
       } else {