wasm2js2 import fixes (#2031)

* Don't assume function types exist in legalize-js-interface.
* Properly handle (ignore) imports in RemoveNonJSOps - do not try to recurse into them.
* Run legalize-js-interface and remove-unused-module-elements in wasm2js, the first is necessary, the last is nice to have.

Author: kripken

scripts/test/env.js

@@ -1 +1,12 @@
+var tempRet0 = 0;
+
+export function setTempRet0(x) {
+  tempRet0 = x;
+}
+
+export function getTempRet0() {
+  return tempRet0;
+}
+
 export const __tempMemory__ = 0;
+

src/passes/LegalizeJSInterface.cpp

@@ -71,8 +71,7 @@ struct LegalizeJSInterface : public Pass {
     }
     // for each illegal import, we must call a legalized stub instead
     for (auto* im : originalFunctions) {
-      if (im->imported() && isIllegal(module->getFunctionType(im->type))
-                         && shouldBeLegalized(im)) {
+      if (im->imported() && isIllegal(im) && shouldBeLegalized(im)) {
         auto funcName = makeLegalStubForCalledImport(im, module);
         illegalImportsToLegal[im->name] = funcName;
         // we need to use the legalized version in the table, as the import from JS
@@ -209,7 +208,7 @@ struct LegalizeJSInterface : public Pass {
     auto* call = module->allocator.alloc<Call>();
     call->target = legal->name;
 
-    auto* imFunctionType = module->getFunctionType(im->type);
+    auto* imFunctionType = ensureFunctionType(getSig(im), module);
 
     for (auto param : imFunctionType->params) {
       if (param == i64) {

src/passes/RemoveNonJSOps.cpp

@@ -128,7 +128,10 @@ struct RemoveNonJSOpsPass : public WalkerPass<PostWalker<RemoveNonJSOpsPass>> {
     auto function = m.getFunction(name);
     FindAll<Call> calls(function->body);
     for (auto* call : calls.list) {
-      this->addNeededFunctions(m, call->target, needed);
+      auto* called = m.getFunction(call->target);
+      if (!called->imported()) {
+        this->addNeededFunctions(m, call->target, needed);
+      }
     }
   }
 

src/wasm2js.h

@@ -290,6 +290,7 @@ class Wasm2JSBuilder {
 Ref Wasm2JSBuilder::processWasm(Module* wasm, Name funcName) {
   PassRunner runner(wasm);
   runner.add<AutoDrop>();
+  runner.add("legalize-js-interface");
   // First up remove as many non-JS operations we can, including things like
   // 64-bit integer multiplication/division, `f32.nearest` instructions, etc.
   // This may inject intrinsics which use i64 so it needs to be run before the
@@ -303,6 +304,7 @@ Ref Wasm2JSBuilder::processWasm(Module* wasm, Name funcName) {
   runner.add("simplify-locals-notee-nostructure");
   runner.add("reorder-locals");
   runner.add("vacuum");
+  runner.add("remove-unused-module-elements");
   runner.setDebug(flags.debug);
   runner.run();
 
@@ -311,7 +313,7 @@ Ref Wasm2JSBuilder::processWasm(Module* wasm, Name funcName) {
 #ifndef NDEBUG
   if (!WasmValidator().validate(*wasm)) {
     WasmPrinter::printModule(wasm);
-    Fatal() << "error in validating input";
+    Fatal() << "error in validating wasm2js output";
   }
 #endif
 

test/binaryen.js/emit_asmjs.js.txt

@@ -21,7 +21,6 @@ function asmFunc(global, env, buffer) {
  var abort = env.abort;
  var nan = global.NaN;
  var infinity = global.Infinity;
- var i64toi32_i32$HIGH_BITS = 0;
  function main($0) {
   $0 = $0 | 0;
   return $0 | 0;

test/wasm2js.asserts.js

@@ -52,7 +52,6 @@ function asmFunc0(global, env, buffer) {
  var abort = env.abort;
  var nan = global.NaN;
  var infinity = global.Infinity;
- var i64toi32_i32$HIGH_BITS = 0;
  function $0() {
 
  }
@@ -69,16 +68,11 @@ function asmFunc0(global, env, buffer) {
   return (x | 0) / (y | 0) | 0 | 0;
  }
 
- function __wasm_fetch_high_bits() {
-  return i64toi32_i32$HIGH_BITS | 0;
- }
- 
  var FUNCTION_TABLE = [];
  return {
   empty: $0, 
   add: $1, 
-  div_s: $2, 
-  __wasm_fetch_high_bits: __wasm_fetch_high_bits
+  div_s: $2
  };
 }
 

test/wasm2js.traps.js

@@ -52,7 +52,6 @@ function asmFunc0(global, env, buffer) {
  var abort = env.abort;
  var nan = global.NaN;
  var infinity = global.Infinity;
- var i64toi32_i32$HIGH_BITS = 0;
  function $0() {
 
  }
@@ -69,16 +68,11 @@ function asmFunc0(global, env, buffer) {
   return (x | 0) / (y | 0) | 0 | 0;
  }
 
- function __wasm_fetch_high_bits() {
-  return i64toi32_i32$HIGH_BITS | 0;
- }
- 
  var FUNCTION_TABLE = [];
  return {
   empty: $0, 
   add: $1, 
-  div_s: $2, 
-  __wasm_fetch_high_bits: __wasm_fetch_high_bits
+  div_s: $2
  };
 }
 

test/wasm2js/address.2asm.js

@@ -23,7 +23,6 @@ function asmFunc(global, env, buffer) {
  var nan = global.NaN;
  var infinity = global.Infinity;
  var print = env.print;
- var i64toi32_i32$HIGH_BITS = 0;
  function $0(i) {
   i = i | 0;
   var wasm2js_i32$0 = 0;

test/wasm2js/base64.2asm.js

@@ -21,29 +21,11 @@ function asmFunc(global, env, buffer) {
  var abort = env.abort;
  var nan = global.NaN;
  var infinity = global.Infinity;
- var i64toi32_i32$HIGH_BITS = 0;
  var FUNCTION_TABLE = [];
  return {
 
  };
 }
 
 const memasmFunc = new ArrayBuffer(65536);
-const assignasmFunc = (
-    function(mem) {
-      const _mem = new Uint8Array(mem);
-      return function(offset, s) {
-        if (typeof Buffer === 'undefined') {
-          const bytes = atob(s);
-          for (let i = 0; i < bytes.length; i++)
-            _mem[offset + i] = bytes.charCodeAt(i);
-        } else {
-          const bytes = Buffer.from(s, 'base64');
-          for (let i = 0; i < bytes.length; i++)
-            _mem[offset + i] = bytes[i];
-        }
-      }
-    }
-  )(memasmFunc);
-assignasmFunc(2, "AP7/");
 const retasmFunc = asmFunc({Math,Int8Array,Uint8Array,Int16Array,Uint16Array,Int32Array,Uint32Array,Float32Array,Float64Array,NaN,Infinity}, {abort:function() { throw new Error('abort'); }},memasmFunc);

test/wasm2js/block.2asm.js

@@ -21,7 +21,6 @@ function asmFunc(global, env, buffer) {
  var abort = env.abort;
  var nan = global.NaN;
  var infinity = global.Infinity;
- var i64toi32_i32$HIGH_BITS = 0;
  function dummy() {
 
  }