[WebAssembly] Handle weak undefined functions with a synthetic stub

[ncw]

Summary

This error case is described in Linking.md. The operand for call requires generation of a synthetic stub.

Add test for this case.

[sbc100]

wasm/InputFiles.cpp

88

i'm curious, is llc capable of generating such a call or will it always using call_indirect in this case?

if possible I'd rather generate the test inputs from bitcode (or ever better assembly) rather than basically checking in binary code.

[sbc100]

wasm/InputFiles.cpp

94

Would it make more sense to check !Sym->isDefined()?

[ncw]

wasm/InputFiles.cpp

88

Yes, llc can generate such a call. But I regard that as a bug and I'm going to submit a patch for it when I get round to it!

(I've filed this one in Bugzilla)

If you have code like this, then clang will currently generate an unlinkable object file:

void __attribute__((weak)) maybeFn(void);

void callOrSkip() {
  if (maybeFn) maybeFn();
}

There's really no other way to use weak undefined symbols! Yet currently we write out Wasm like this:

(func callOrSkip
  if (const.i32 @R_TABLE_INDEX_SLEB(maybeFn))
    call @R_FUNCTION_INDEX_SLEB(maybe)
)

It can't link because the call won't validate the Wasm type checker....

I reckon that the frontend should use call_indirect for all calls to weak functions that aren't defined in the translation unit, otherwise it's basically unusable.

94

You think? We're calling getOutputIndex on the line below, it seems like it's the obvious way to check whether that will succeed/fail!

[sbc100]

wasm/InputFiles.cpp

94

But the error message says the thing is undefined.

Actually, rethinking this I think you are right. Since we can actually have undefined functions that do have their output index set in which case we don't want to fail here.

I kind of want there to be a better why to check for this particular case though, some kind of "isNeitherDefinedNorUndefined()".. but I'm ok with this for now.

[ncw]

You said "I'm OK with this for now" in the last comment - is the PR as a whole OK to merge then?

[sbc100]

How about this for a longer term solution: When a relocation like this is found the linker can create a linker synthetic function which will abort.. a simple one might be "call_indirect 0" which we know.

For globals I think we can ban weak references, since there is no way to checking the address of a global before calling get_global in it.

I'm happy with the code change for now, but can you write the test as minimal piece of bitcode rather than yaml. (Is there some reason you didn't do that already?)

[ncw]

In D44028#1027253, @sbc100 wrote:

How about this for a longer term solution: When a relocation like this is found the linker can create a linker synthetic function which will abort.. a simple one might be "call_indirect 0" which we know.

I thought about that too... the synthetic function would just be (func (type) unreachable) of course! It's messy as you need a separate one for each type signature. It adds quite a bit of "weight" and machinery to LLD.

It basically comes down to whether you think this should be "fixed" in LLD or LLC; should we make a dummy unreachable function in LLD or bodge LLC to emit call_indirect for weak-undefined calls. This patch is currently operating on the basis that the fix will be in LLC... but actually maybe you could convince me otherwise. We shouldn't really use call_indirect for things that aren't truly indirect, so even though it's a nuisance, maybe the linker-synthetic functions are right after all.

For globals I think we can ban weak references, since there is no way to checking the address of a global before calling get_global in it.

Hm, on reflection, I agree. We should disallow undefined globals, even if weak.

I'm happy with the code change for now, but can you write the test as minimal piece of bitcode rather than yaml. (Is there some reason you didn't do that already?)

I'm not sure I can, for the global case (there's no way to emit globals other than __stack_pointer currently). For the "call" case, I can change over to bitcode, OK.

[ncw]

OK, here's the new approach! It's basically the complete opposite of the previous approach. Weak undefined globals are disallowed entirely, and weak undefined functions are allowed and supported via some new synthetic stubs.

The tests have good coverage: they check that the synthetic stubs are eligible for GC, and check that the stub is emitted when needed.

[sbc100]

Thanks. Looks like a good approach. Good that we already had support for synthetic functions.

Lets see if there is any feedback on https://github.com/WebAssembly/tool-conventions/issues/46 before we land this.

test/wasm/undefined-weak-call.ll

88

Is it OK that all these will have the same name?

Perhaps its worth adding a test for two function with the same sig? And two functions with different sigs? (Either in this test file or separate).

test/wasm/undefined-weak-getglobal.test

7

Shall we make this even stronger and say that WEAK undefined symbols are not allowed for global at all, then we can put this check in the object file reader and we would need this check or this test in lld?

There is no point in having WEAK undefined symbols if they can't actually undefined at link time is there? Then it might as well be strong?

wasm/MarkLive.cpp

84

What would be the harm in marking them as live here?

wasm/SymbolTable.h

52

This formatting looks off (Can you run git clang-format origin/master?)

wasm/Writer.cpp

738

Is it worth making this getSyntheticFunctions, and then we can add the __wasm_call_ctors function to this list and it will get added via AddDefinedFunction too?

[ruiu]

test/wasm/undefined-weak-call.test

1 ↗

(On Diff #136783)

Use of yaml2obj is not encouraged. Is there any way to write it in .s or in .ll?

2 ↗

(On Diff #136783)

Please use wasm-ld. lld as a command is essentially deprecated.

[ncw]

test/wasm/undefined-weak-call.ll

88

Yes it should be OK. I'll check in a test though, you're right it's necessary.

test/wasm/undefined-weak-call.test

2 ↗

(On Diff #136783)

Already done in one case, I'll squash the other too. Thanks!

I've got rid of one of the yaml2obj uses, I'll get rid of the other based on Sam's improvement to push the check back into WasmObjectFile.

test/wasm/undefined-weak-getglobal.test

7

D'oh, of course, I somehow rationalised it to myself but yes, there's no point allowing the Weak flag on undefined globals at all, if it's only legal to link when the symbol is actually defined.

Then we'll all be happy because this test case can go, and we won't need to use yaml2obj, etc.

wasm/MarkLive.cpp

84

If they were marked live, they'd be included in the final binary even if never called. Just harmless bloat. Some of our existing tests do this - only ever call a weak undefined indirectly via its address. Since the address evaluates to zero, the stub is as dead as can be and seems a reasonable candidate for GC.

wasm/Writer.cpp

738

With some wider refactoring... there's a chicken-and-egg problem though.

Building the body (InputFunction) for CallCtors happens at the very end, since it doesn't have relocations and so needs all the function indexes to have been previously assigned. Hence we can't have the InputFunction for CallCtors available here in Writer::assignIndexes, where the indexes are set for the first time!

CallCtors is naturally a "late defined" synthetic (again assuming it's generated without relocs), and the weak stubs are naturally "early defined" (because to me it makes most sense to build them just before calling reportRemainingUndefines, since they do similar things).

If you want CallCtors to be processed via Writer::assignIndexes, then we'd have to generate the CallCtors body much earlier and actually generate relocs for it. That might actually be the better option - but it's for another commit.

[sbc100]

wasm/MarkLive.cpp

84

Hmm I think I see.. since the table index is 0, it can have its address taken, without needing the function body to be including. This is pretty obscure. Maybe a clearer comment.. its not the fact that it has an index already, but specifically that the index is 0 that allows us to do this, right? Otherwise the address taking would necessitate the liveness of the body, right?

[ncw]

Updated: addressed feeback; removed globals (split out into D44201); clang-formatted

[ruiu]

I have a few questions because I don't know much about this wasm feature...

1. Let's say WeakFunc is a weak function symbol that is not defined at link time. Then if (WeakFunc) should be evaluated to false... but how does it actually be translated to wasm instructions? Is it compiled to a indirect call with function index 0?
2. I'm not 100% sure why we need to provide a dummy function for an unresolved weak undefined symbols. Is it for catching an error when a program accidentally calls an undefined weak symbol at runtime? Then, I wonder if we want a function that prints out a better error message (e.g. "unresolved weak function foo is invoked`"), instead of just killing itself with a UB instruction.

[sbc100]

In D44028#1030026, @ruiu wrote:

I have a few questions because I don't know much about this wasm feature...

1. Let's say WeakFunc is a weak function symbol that is not defined at link time. Then if (WeakFunc) should be evaluated to false... but how does it actually be translated to wasm instructions? Is it compiled to a indirect call with function index 0?

The address of a function is its table index in the indirection function call table. For weak undefined functions (or null functions) this will be zero. However the following call is *direct* call, not a call_indirect. And direct calls are more efficient we do want continue to use direct calls wherever we can.

2. I'm not 100% sure why we need to provide a dummy function for an unresolved weak undefined symbols. Is it for catching an error when a program accidentally calls an undefined weak symbol at runtime? Then, I wonder if we want a function that prints out a better error message (e.g. "unresolved weak function foo is invoked`"), instead of just killing itself with a UB instruction.

Yes, its for catching that specific case. In this case the linker needs insert some valid function index into the direct call instruction. It it doesn't insert a valid function index with the correct signature, the module will fail to validate (i.e. will fail to load). We could generate a better synthetic function with a nice error message. However, that would add complexity to the code generation, and I think we are already on shakey ground adding any kind of code generation to the linker. Also, simply crashing is what existing platforms do, so I think that can/should be expected. At least, I don't think we should block this change on making an nice error message, unless you want to push the code generation part into the compiler instead?

[sbc100]

wasm/Driver.cpp

328

I'm not sure this makes sense to be part of the symbol table itself. Can this be a local function here in Driver.cpp?

[ncw]

Good questions. So the call pattern we want to support is fairly common in libraries like libc - you have an optional function that's called only if the linker pulls it in.

For C code looking like this:

int foo() __attribute__((weak));

void callFooOrSkip() {
  if (&foo)
    foo();
}

On x86, you get code like this:

00000000 <callFooOrSkip>:
   0:   b8 00 00 00 00          mov    $0x0,%eax
                        1: R_386_32     foo
   5:   85 c0                   test   %eax,%eax
   7:   74 05                   je     e <callFooOrSkip+0xe>
   9:   e9 fc ff ff ff          jmp    a <callFooOrSkip+0xa>
                        a: R_386_PC32   foo
   e:   c3                      ret

There's a relocation for the function pointer, and a second one for the operand of the call. At link time, the linker can just put null in there for both values, or garbage - if the CPU ever were to take the "if" branch, or if the call to foo() were not guarded with an if, it wouldn't matter if process were to crash with SIGSEGV. The jmp doesn't need to legal - only if it's ever actually taken.

On Wasm, you get code like this:

block
  i32.const @R_WEBASSEMBLY_TABLE_INDEX(foo)  ; push function index to stack
  i32.eqz             ; pop value from stack, push bool to stack whether it's equal
  br_if               ; pop value from stack, break out of block if it's true
  call @R_WEBASSEMBLY_FUNC_INDEX(foo) ; call and push rv to stack
  drop           ; pop ignored rv from stack
end

Again there are two relocations. But here's the difference - you can't put null/zero as the operand to the call instruction. The Wasm validator is precisely designed to make it impossible to write code that fails with SIGSEGV! Regardless of whether the branch is ever taken, there has to be _something_ to go there. Hence the creation of the linker-synthetic functions. We don't expect the stubs to be called, they just have to exist to make the Wasm legal (and abort sensibly if they are somehow called).

[ruiu]

The address of a function is its table index in the indirection function call table. For weak undefined functions (or null functions) this will be zero. However the following call is *direct* call, not a call_indirect. And direct calls are more efficient we do want continue to use direct calls wherever we can.

I see. Thank you for the explanation!

Yes, its for catching that specific case. In this case the linker needs insert some valid function index into the direct call instruction. It it doesn't insert a valid function index with the correct signature, the module will fail to validate (i.e. will fail to load). We could generate a better synthetic function with a nice error message. However, that would add complexity to the code generation, and I think we are already on shakey ground adding any kind of code generation to the linker. Also, simply crashing is what existing platforms do, so I think that can/should be expected. At least, I don't think we should block this change on making an nice error message, unless you want to push the code generation part into the compiler instead?

It shouldn't block this change indeed. I was just trying to understand this patch.

I'm not too worried that we generate wasm instructions in the linker. Unlike other file formats, wasm supports and will support only one machine instruction -- that's the wasm instructions. So, if something is easy or natural to implement in a linker instead of a compiler, I think we shouldn't hesitate to do that.

wasm/MarkLive.cpp

78–85

Adding a special rule for a weak symbol seems a bit odd to me because they are orthogonal in concept. What if you create functions after you garbage-collect symbols? Then you can remove this logic, can't you?

wasm/SymbolTable.cpp

36

I believe in LLVM style global variables are written in the same way as local variables. So it is UnreachableFn.

41

This needs comment. Please describe the semantics of the weak undefined functions in wasm and what we are doing in this function.

42

I'm not too worried about the use of a hash table in this function because I believe the number of weak symbols in a program is small. But I'd like to reiterate that doing something like this (use a hash table for all symbols) is in general discouraged in lld as it makes the linker noticeably slow.

wasm/Symbols.h

65

You are not using this function.

126–128

I'd remove this function and inline it because it's too small and both hasTableIndex and getTableIndex is externally available.

[sbc100]

wasm/MarkLive.cpp

78–85

I also find this part of the change a little bit strange. And I think the hasNullTableIndex() method helps to describe what is going on here. However, inlineing hasNullTableIndex() along with a good comment is OK too.

[ncw]

Updated: addressed comments, clang-formatted

[ncw]

wasm/MarkLive.cpp

78–85

It's not a super-special rule: it's generic in the sense that it would apply to any symbol that had the (weird) property of needing to compare equal to the null pointer. It's not checking for weakness, it's checking something that's actually relevant to the relocation we're considering here. I agree it's not ideal, but I think it's OK (there's already a decent comment above).

[ruiu]

wasm/MarkLive.cpp

78–85

I'm little confused -- why do we need this in the first place? Even if a weak symbol is resolved to function table index zero, you can still call it, and if you call it, it should abort with UB, no?

[sbc100]

wasm/MarkLive.cpp

78–85

This is an GC optimization, for the case where such as function is address taken but never called, in that case we want to GC the dummy function (which is why we don't mark it live here). Normally one cannot determine that address taken functions are never called.. but in this case we can.

I you think it makes sense, I'd be OK with forgoing this optimization for the sake of clarity, since its hard to imagine a case where it would make a big difference to codesize.

[ruiu]

wasm/MarkLive.cpp

78–85

If a program takes an address of a function, that function might be called somewhere using a indirect call instruction, so I don't think that we cannot really guarantee that the function we are trying to eliminate here isn't called at runtime.

Or, in wasm, can you guarantee that?

[sbc100]

wasm/MarkLive.cpp

78–85

Indeed, that is the (perhaps too) clever trick here. For these functions we know that their address is 0 (table index that is)... we don't need to include the stub for indirect calls, since indirect calls to 0 are handled separably. The stub function is *only* for the direct calls which have different relocation type.

[ruiu]

wasm/MarkLive.cpp

78–85

since indirect calls to 0 are handled separably

... by the runtime? If so, this code makes sense to me. Can you describe that in the comment explicitly? I'd say something like...

A weak function is resolved to function table index 0 with a stub function body that aborts with undefined instruction exception. We need a stub function as a indirect branch target, but we don't need it for function table index 0, since the runtime handles it as an invalid function for us. So, if all references to a stub function goes through the index 0, we can eliminate that function. Thus we don't exclude that case here.

[ncw]

wasm/MarkLive.cpp

78–85

I'll expand the comment along those lines, thanks.

Is it "approved" with a better comment? (Not that I can commit until D44150 is merged...)

[ruiu]

Yes. LGTM. Thanks!

[ncw]

I hope this is OK, but when I committed I made one additional change, that I think makes sense.

Rather than being stingy and emitting one stub per type, I'm now emitting one per function - the stubs are very small, and the advantage is that you'll now get a nice stack trace if these things ever should be called (since they can be named sensibly, to indicate which function was missing).

[ruiu]

wasm/Symbols.h

321

Please revert this change. toString() is supposed to be a stringize function for an object, so it should print out only the information of object itself, and no information should be included other than that. Passing a second argument for "supplemental" purpose break that principle.

test/wasm/undefined-weak-call.ll

+; RUN: llc -filetype=obj %s -o %t.o
+; RUN: wasm-ld --check-signatures --no-entry %t.o -o %t.wasm
+; RUN: obj2yaml %t.wasm | FileCheck %s
+
+; Check that calling an undefined weak function generates an appropriate stub
+; that will fail at runtime with "unreachable".
+
+target triple = "wasm32-unknown-unknown-wasm"
+
+declare extern_weak void @weakFunc() local_unnamed_addr
+define void @callWeakFunc() {
+  call void @weakFunc()
+  ret void
+}
+
+; CHECK:      --- !WASM
+; CHECK-NEXT: FileHeader:
+; CHECK-NEXT:   Version:         0x00000001
+; CHECK-NEXT: Sections:
+; CHECK-NEXT:   - Type:            TYPE
+; CHECK-NEXT:     Signatures:
+; CHECK-NEXT:       - Index:           0
+; CHECK-NEXT:         ReturnType:      NORESULT
+; CHECK-NEXT:         ParamTypes:
+; CHECK-NEXT:   - Type:            FUNCTION
+; CHECK-NEXT:     FunctionTypes:   [ 0, 0, 0 ]
+; CHECK-NEXT:   - Type:            TABLE
+; CHECK-NEXT:     Tables:
+; CHECK-NEXT:       - ElemType:        ANYFUNC
+; CHECK-NEXT:         Limits:
+; CHECK-NEXT:           Flags:           [ HAS_MAX ]
+; CHECK-NEXT:           Initial:         0x00000001
+; CHECK-NEXT:           Maximum:         0x00000001
+; CHECK-NEXT:   - Type:            MEMORY
+; CHECK-NEXT:     Memories:
+; CHECK-NEXT:       - Initial:         0x00000002
+; CHECK-NEXT:   - Type:            GLOBAL
+; CHECK-NEXT:     Globals:
+; CHECK-NEXT:       - Index:           0
+; CHECK-NEXT:         Type:            I32
+; CHECK-NEXT:         Mutable:         true
+; CHECK-NEXT:         InitExpr:
+; CHECK-NEXT:           Opcode:          I32_CONST
+; CHECK-NEXT:           Value:           66560
+; CHECK-NEXT:       - Index:           1
+; CHECK-NEXT:         Type:            I32
+; CHECK-NEXT:         Mutable:         false
+; CHECK-NEXT:         InitExpr:
+; CHECK-NEXT:           Opcode:          I32_CONST
+; CHECK-NEXT:           Value:           66560
+; CHECK-NEXT:       - Index:           2
+; CHECK-NEXT:         Type:            I32
+; CHECK-NEXT:         Mutable:         false
+; CHECK-NEXT:         InitExpr:
+; CHECK-NEXT:           Opcode:          I32_CONST
+; CHECK-NEXT:           Value:           1024
+; CHECK-NEXT:   - Type:            EXPORT
+; CHECK-NEXT:     Exports:
+; CHECK-NEXT:       - Name:            memory
+; CHECK-NEXT:         Kind:            MEMORY
+; CHECK-NEXT:         Index:           0
+; CHECK-NEXT:       - Name:            __heap_base
+; CHECK-NEXT:         Kind:            GLOBAL
+; CHECK-NEXT:         Index:           1
+; CHECK-NEXT:       - Name:            __data_end
+; CHECK-NEXT:         Kind:            GLOBAL
+; CHECK-NEXT:         Index:           2
+; CHECK-NEXT:       - Name:            callWeakFunc
+; CHECK-NEXT:         Kind:            FUNCTION
+; CHECK-NEXT:         Index:           0
+; CHECK-NEXT:   - Type:            CODE
+; CHECK-NEXT:     Functions:
+; CHECK-NEXT:       - Index:           0
+; CHECK-NEXT:         Locals:
+; CHECK-NEXT:         Body:            1081808080000B
+; CHECK-NEXT:       - Index:           1
+; CHECK-NEXT:         Locals:
+; CHECK-NEXT:         Body:            000B
+; CHECK-NEXT:       - Index:           2
+; CHECK-NEXT:         Locals:
+; CHECK-NEXT:         Body:            0B
+; CHECK-NEXT:   - Type:            CUSTOM
+; CHECK-NEXT:     Name:            name
+; CHECK-NEXT:     FunctionNames:
+; CHECK-NEXT:       - Index:           0
+; CHECK-NEXT:         Name:            callWeakFunc
+; CHECK-NEXT:       - Index:           1
+; CHECK-NEXT:         Name:            __undefined
+; CHECK-NEXT:       - Index:           2
+; CHECK-NEXT:         Name:            __wasm_call_ctors
+; CHECK-NEXT: ...

test/wasm/undefined-weak-getglobal.test

+# RUN: yaml2obj %s > %t.o
+# RUN: not lld -flavor wasm --no-entry %t.o -o %t.wasm 2>&1 | FileCheck %s
+
+# Check linking fails when the input file contains weak symbols, and relocations
+# which reference those symbols and cannot be resolved.
+
+# CHECK: {{.*}}.o: undefined weak global symbol: weakGlobal
+
+--- !WASM
+FileHeader:
+  Version:         0x00000001
+Sections:
+  - Type:            TYPE
+    Signatures:
+      - Index:           0
+        ReturnType:      NORESULT
+        ParamTypes:
+  - Type:            IMPORT
+    Imports:
+      - Module:          env
+        Field:           weakGlobal
+        Kind:            GLOBAL
+        GlobalType:      I32
+        GlobalMutable:   true
+  - Type:            FUNCTION
+    FunctionTypes:   [ 0 ]
+  - Type:            CODE
+    Relocations:
+      - Type:            R_WEBASSEMBLY_GLOBAL_INDEX_LEB
+        Index:           0
+        Offset:          0x00000004
+    Functions:
+      - Index:           0
+        Locals:
+        Body:            2380808080001A0F0B
+  - Type:            CUSTOM
+    Name:            linking
+    SymbolTable:
+      - Index:           0
+        Kind:            GLOBAL
+        Name:            weakGlobal
+        Flags:           [ UNDEFINED, BINDING_WEAK ]
+        Global:          0
+      - Index:           1
+        Kind:            FUNCTION
+        Name:            getWeakGlobal
+        Flags:           [  ]
+        Function:        0

wasm/Driver.cpp

void LinkerDriver::link(ArrayRef<const char *> ArgsArr) {
   if (errorCount())
     return;
 
   // Add all files to the symbol table. This will add almost all
   // symbols that we need to the symbol table.
   for (InputFile *F : Files)
     Symtab->addFile(F);
 
+  // Add synthetic dummies for weak undefined functions.
+  if (!Config->Relocatable)
+    Symtab->handleWeakUndefines();
+
   // Make sure we have resolved all symbols.
   if (!Config->Relocatable && !Config->AllowUndefined) {
     Symtab->reportRemainingUndefines();
   } else {
     // When we allow undefined symbols we cannot include those defined in
     // -u/--undefined since these undefined symbols have only names and no
     // function signature, which means they cannot be written to the final
     // output.

wasm/InputFiles.cpp

uint32_t ObjFile::calcNewIndex(const WasmRelocation &Reloc) const {
   }
   return Symbols[Reloc.Index]->getOutputSymbolIndex();
 }
 
 // Translate from the relocation's index into the final linked output value.
 uint32_t ObjFile::calcNewValue(const WasmRelocation &Reloc) const {
   switch (Reloc.Type) {
   case R_WEBASSEMBLY_TABLE_INDEX_I32:
-  case R_WEBASSEMBLY_TABLE_INDEX_SLEB: {
-    // The null case is possible, if you take the address of a weak function
-    // that's simply not supplied.
-    FunctionSymbol *Sym = getFunctionSymbol(Reloc.Index);
-    if (Sym->hasTableIndex())
-      return Sym->getTableIndex();
-    return 0;
-  }
+  case R_WEBASSEMBLY_TABLE_INDEX_SLEB:
+    return getFunctionSymbol(Reloc.Index)->getTableIndex();
   case R_WEBASSEMBLY_MEMORY_ADDR_SLEB:
   case R_WEBASSEMBLY_MEMORY_ADDR_I32:
   case R_WEBASSEMBLY_MEMORY_ADDR_LEB:
     if (auto *Sym = dyn_cast<DefinedData>(getDataSymbol(Reloc.Index)))
       return Sym->getVirtualAddress() + Reloc.Addend;
     return Reloc.Addend;
   case R_WEBASSEMBLY_TYPE_INDEX_LEB:
     return TypeMap[Reloc.Index];
   case R_WEBASSEMBLY_FUNCTION_INDEX_LEB:
     return getFunctionSymbol(Reloc.Index)->getOutputIndex();
   case R_WEBASSEMBLY_GLOBAL_INDEX_LEB:
     return getGlobalSymbol(Reloc.Index)->getOutputIndex();
   default:
     llvm_unreachable("unknown relocation type");
   }
 }
 
 void ObjFile::parse() {
   // Parse a memory buffer as a wasm file.
   DEBUG(dbgs() << "Parsing object: " << toString(this) << "\n");
   std::unique_ptr<Binary> Bin = CHECK(createBinary(MB), toString(this));
 
   auto *Obj = dyn_cast<WasmObjectFile>(Bin.get());
   if (!Obj)
     fatal(toString(this) + ": not a wasm file");
   if (!Obj->isRelocatableObject())
     fatal(toString(this) + ": not a relocatable wasm file");
 
   Bin.release();
   WasmObj.reset(Obj);
 
   // Find the code and data sections.  Wasm objects can have at most one code
   // and one data section.

wasm/MarkLive.cpp

for (const WasmInitFunc &F : L.InitFunctions)
       Enqueue(Obj->getFunctionSymbol(F.Symbol));
   }
 
   // Follow relocations to mark all reachable chunks.
   while (!Q.empty()) {
     InputChunk *C = Q.pop_back_val();
 
     for (const WasmRelocation Reloc : C->getRelocations()) {
-      if (Reloc.Type != R_WEBASSEMBLY_TYPE_INDEX_LEB)
-        Enqueue(C->File->getSymbol(Reloc.Index));
+      if (Reloc.Type == R_WEBASSEMBLY_TYPE_INDEX_LEB)
+        continue;
+      Symbol *Sym = C->File->getSymbol(Reloc.Index);
+      // Don't mark functions live if we're taking the address of a synthetic
+      // function which already has a table index.
+      if ((Reloc.Type == R_WEBASSEMBLY_TABLE_INDEX_SLEB ||
+           Reloc.Type == R_WEBASSEMBLY_TABLE_INDEX_I32) &&
+          cast<FunctionSymbol>(Sym)->hasTableIndex())
+        continue;
+      Enqueue(Sym);
     }
   }
 
   // Report garbage-collected sections.
   if (Config->PrintGcSections) {
     for (const ObjFile *Obj : Symtab->ObjectFiles) {
       for (InputChunk *C : Obj->Functions)
         if (!C->Live)
           message("removing unused section " + toString(C));
       for (InputChunk *C : Obj->Segments)
         if (!C->Live)
           message("removing unused section " + toString(C));
     }
   }
 }

wasm/SymbolTable.h

 // add*() functions, which are called by input files as they are parsed.
 // There is one add* function per symbol type.
 class SymbolTable {
 public:
   void addFile(InputFile *File);
 
   std::vector<ObjFile *> ObjectFiles;
 
+  void handleWeakUndefines();
   void reportRemainingUndefines();
 
   ArrayRef<Symbol *> getSymbols() const { return SymVector; }
   Symbol *find(StringRef Name);
 
+  ArrayRef<InputFunction *> getWeakUndefinedStubs() const
+  { return WeakUndefinedStubs; }
+
   Symbol *addDefinedFunction(StringRef Name, uint32_t Flags, InputFile *File,
                              InputFunction *Function);
   Symbol *addDefinedData(StringRef Name, uint32_t Flags, InputFile *File,
                          InputSegment *Segment, uint32_t Address,
                          uint32_t Size);
   Symbol *addDefinedGlobal(StringRef Name, uint32_t Flags, InputFile *File,
                            InputGlobal *G);
 
DefinedFunction *addSyntheticFunction(StringRef Name,
                                         const WasmSignature *Type,
                                         uint32_t Flags);
 
 private:
   std::pair<Symbol *, bool> insert(StringRef Name);
 
   llvm::DenseMap<llvm::CachedHashStringRef, Symbol *> SymMap;
   std::vector<Symbol *> SymVector;
+  std::vector<InputFunction *> WeakUndefinedStubs;
 
   llvm::DenseMap<StringRef, const ObjFile *> Comdats;
 };
 
 extern SymbolTable *Symtab;
 
 } // namespace wasm
 } // namespace lld
 
 #endif

wasm/SymbolTable.cpp

 void SymbolTable::addFile(InputFile *File) {
   log("Processing: " + toString(File));
   File->parse();
 
   if (auto *F = dyn_cast<ObjFile>(File))
     ObjectFiles.push_back(F);
 }
 
+static const uint8_t UNREACHABLE_FN[] = {
+  0x03 /* ULEB length */, 0x00 /* ULEB num locals */,
+  0x00 /* opcode unreachable */, 0x0b /* opcode end */
+};
+
+void SymbolTable::handleWeakUndefines() {
+  DenseMap<WasmSignature, InputFunction *> UndefinedFunctions;
+  for (Symbol *Sym : SymVector) {
+    if (!Sym->isUndefined() || !Sym->isWeak() || isa<DataSymbol>(Sym))
+      continue;
+
+    // Report an error for weak undefined globals.  Even though weak, we can't
+    // allow these to remain undefined, since any code that references them
+    // can't be fixed up by simple patching/relocations.
+    if (isa<GlobalSymbol>(Sym)) {
+      error(toString(Sym->getFile()) + ": undefined weak global symbol: " +
+            toString(*Sym));
+      continue;
+    }
+
+    // It is possible for undefined functions not to have a signature (eg. if
+    // added via "--undefined"), but weak undefined ones do have a signature.
+    const WasmSignature &Sig = *cast<FunctionSymbol>(Sym)->getFunctionType();
+
+    // Add a synthetic dummy for weak undefined functions.  These dummies will
+    // be GC'd if not used as the target of any "call" instructions.
+    InputFunction *&Function = UndefinedFunctions[Sig];
+    if (!Function) {
+      Function = make<SyntheticFunction>(Sig, UNREACHABLE_FN, "__undefined");
+      WeakUndefinedStubs.emplace_back(Function);
+    }
+    // Hide our dummy to prevent export
+    uint32_t Flags = (Sym->getFlags() & ~WASM_SYMBOL_VISIBILITY_MASK) |
+                     WASM_SYMBOL_VISIBILITY_HIDDEN;
+    auto *DefSym = replaceSymbol<DefinedFunction>(Sym, Sym->getName(), Flags,
+                                                  nullptr, Function);
+    // Ensure it compares equal to the null pointer, and so that table relocs
+    // don't pull in the stub body (only call-operand relocs should do that).
+    DefSym->setTableIndex(0);
+  }
+}
+
 void SymbolTable::reportRemainingUndefines() {
   SetVector<Symbol *> Undefs;
   for (Symbol *Sym : SymVector) {
     if (Sym->isUndefined() && !Sym->isWeak() &&
         Config->AllowUndefinedSymbols.count(Sym->getName()) == 0) {
       Undefs.insert(Sym);
     }
   }

wasm/Symbols.h

return SymbolKind == UndefinedFunctionKind ||
            SymbolKind == UndefinedDataKind || SymbolKind == UndefinedGlobalKind;
   }
 
   bool isLazy() const { return SymbolKind == LazyKind; }
 
   bool isLocal() const;
   bool isWeak() const;
   bool isHidden() const;
+  uint32_t getFlags() const { return Flags; }
 
   // Returns the symbol name.
   StringRef getName() const { return Name; }
 
   // Returns the file from which this symbol was created.
   InputFile *getFile() const { return File; }
 
   InputChunk *getChunk() const;
public:
   uint32_t getTableIndex() const;
 
   // Returns true if a table index has been set for this symbol
   bool hasTableIndex() const;
 
   // Set the table index of the symbol
   void setTableIndex(uint32_t Index);
 
 protected:
   FunctionSymbol(StringRef Name, Kind K, uint32_t Flags, InputFile *F,
                  const WasmSignature *Type)
       : Symbol(Name, K, Flags, F), FunctionType(Type) {}
 
   uint32_t TableIndex = INVALID_INDEX;
 
   const WasmSignature *FunctionType;
 };
 
 class DefinedFunction : public FunctionSymbol {
T *replaceSymbol(Symbol *S, ArgT &&... Arg) {
   assert(static_cast<Symbol *>(static_cast<T *>(nullptr)) == nullptr &&
          "Not a Symbol");
   return new (S) T(std::forward<ArgT>(Arg)...);
 }
 
 } // namespace wasm
 
 // Returns a symbol name for an error message.
 std::string toString(const wasm::Symbol &Sym);
 std::string toString(wasm::Symbol::Kind Kind);
 std::string toString(WasmSymbolType Type);
 
 } // namespace lld
 
 #endif

wasm/Writer.cpp

if (auto *F = dyn_cast<FunctionSymbol>(Sym))
       registerType(*F->getFunctionType());
 
   for (const InputFunction *F : InputFunctions)
     registerType(F->Signature);
 }
 
 void Writer::assignIndexes() {
   uint32_t FunctionIndex = NumImportedFunctions + InputFunctions.size();
-  for (ObjFile *File : Symtab->ObjectFiles) {
-    DEBUG(dbgs() << "Functions: " << File->getName() << "\n");
-    for (InputFunction *Func : File->Functions) {
-      if (!Func->Live)
-        continue;
-      InputFunctions.emplace_back(Func);
-      Func->setOutputIndex(FunctionIndex++);
-    }
-  }
+  auto AddDefinedFunction = [&](InputFunction *Func) {
+      return;
+  };
+  for (ObjFile *File : Symtab->ObjectFiles) {
+    DEBUG(dbgs() << "Functions: " << File->getName() << "\n");
+    for (InputFunction *Func : File->Functions)
+      AddDefinedFunction(Func);
+  for (InputFunction *Func : Symtab->getWeakUndefinedStubs())
+    AddDefinedFunction(Func);
 
   uint32_t TableIndex = kInitialTableOffset;
   auto HandleRelocs = [&](InputChunk *Chunk) {
     if (!Chunk->Live)
       return;
     ObjFile *File = Chunk->File;
     ArrayRef<WasmSignature> Types = File->getWasmObj()->types();
     for (const WasmRelocation &Reloc : Chunk->getRelocations()) {