assume flattened imports in wasm2asm output

2 files changed, 4 insertions, 3 deletions

diff --git a/src/wasm2asm.h b/src/wasm2asm.h
index 8555e49ec..ba52b1878 100644
--- a/src/wasm2asm.h
+++ b/src/wasm2asm.h
@@ -248,10 +248,11 @@ void Wasm2AsmBuilder::addBasics(Ref ast) {
 void Wasm2AsmBuilder::addImport(Ref ast, Import *import) {
   Ref theVar = ValueBuilder::makeVar();
   ast->push_back(theVar);
+  Ref module = ValueBuilder::makeName(ENV); // TODO: handle nested module imports
   ValueBuilder::appendToVar(theVar,
     fromName(import->name),
     ValueBuilder::makeDot(
-      ValueBuilder::makeName(fromName(import->module)),
+      module,
       fromName(import->base)
     )
   );
diff --git a/test/unit.2asm.js b/test/unit.2asm.js
index 1c06b34a4..9df831571 100644
--- a/test/unit.2asm.js
+++ b/test/unit.2asm.js
@@ -10,8 +10,8 @@ function asmFunc(global, env, buffer) {
  var HEAPF64 = new global.Float64Array(buffer);
  var Math_imul = global.Math.imul;
  var Math_fround = global.Math.fround;
- var f64_to_int = asm2wasm.f64_to_int;
- var f64_rem = asm2wasm.f64_rem;
+ var f64_to_int = env.f64_to_int;
+ var f64_rem = env.f64_rem;
  function big_negative() {
   var temp = 0.0;
   temp = -2147483648.0;