1 files changed, 5 insertions, 12 deletions
diff --git a/src/wasm-js.cpp b/src/wasm-js.cpp
index 4c8e27423..bedc65d48 100644
--- a/src/wasm-js.cpp
+++ b/src/wasm-js.cpp
@@ -95,18 +95,7 @@ extern "C" void EMSCRIPTEN_KEEPALIVE load_asm(char *input) {
         var base = Pointer_stringify($1);
         var tempArguments = Module['tempArguments'];
         Module['tempArguments'] = null;
-        var lookup = Module['info'];
-        if (mod.indexOf('.') < 0) {
-          lookup = (lookup || {})[mod];
-        } else {
-          var parts = mod.split('.');
-          lookup = (lookup || {})[parts[0]];
-          lookup = (lookup || {})[parts[1]];
-        }
-        lookup = (lookup || {})[base];
-        if (!lookup) {
-          abort('bad CallImport to (' + mod + ').' + base);
-        }
+        var lookup = Module['lookupImport'](mod, base);
         return lookup.apply(null, tempArguments);
       }, import->module.str, import->base.str));
     }
@@ -173,6 +162,10 @@ extern "C" void EMSCRIPTEN_KEEPALIVE load_asm(char *input) {
   instance = new ModuleInstance(*wasm, new JSExternalInterface());
 }
 
+// Ready the provided imported globals, copying them to their mapped locations.
+extern "C" void EMSCRIPTEN_KEEPALIVE load_mapped_globals() {
+}
+
 // Does a call from js into an export of the module.
 extern "C" double EMSCRIPTEN_KEEPALIVE call_from_js(const char *target) {
   IString name(target);