From c9ee88bda3b46d251440e17d18727f40e2f871e4 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 18 Jun 2019 11:01:31 -0700
Subject: [PATCH] Preserve the function table during early gc passes

Recent refactorings of wasm-bindgen have inserted multiple `gc` passes
executed by walrus. In these passes though the function table was being
removed a bit too aggressively because it's not exported by LLD and it's
only later that we realize we need to export it.

To handle this case we add synthetic and temporary exports of the
function table and these exports are removed just after the GC pass in
question.

Closes #1603
---
 crates/cli-support/src/descriptors.rs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/crates/cli-support/src/descriptors.rs b/crates/cli-support/src/descriptors.rs
index aef97a14762..3c0c9b6fa66 100644
--- a/crates/cli-support/src/descriptors.rs
+++ b/crates/cli-support/src/descriptors.rs
@@ -40,7 +40,24 @@ pub fn execute(module: &mut Module) -> Result<WasmBindgenDescriptorsSectionId, E
 
     // Delete all descriptor functions and imports from the module now that
     // we've executed all of them.
+    //
+    // Note though that during this GC pass it's a bit aggressive in that it can
+    // delete the function table entirely. We don't actually know at this point
+    // whether we need the function table or not. The bindings generation may
+    // need to export the table so the JS glue can call functions in it, and
+    // that's only discovered during binding selection. For now we just add
+    // synthetic root exports for all tables in the module, and then we delete
+    // the exports just after GC. This should keep tables like the function
+    // table alive during GC all the way through to the bindings generation
+    // where we can either actually export it or gc it out since it's not used.
+    let mut exported_tables = Vec::new();
+    for table in module.tables.iter() {
+        exported_tables.push(module.exports.add("foo", table.id()));
+    }
     walrus::passes::gc::run(module);
+    for export in exported_tables {
+        module.exports.delete(export);
+    }
 
     Ok(module.customs.add(section))
 }