[wasm] Implement correct 2-level namespace for imports.

test/mjsunit/wasm/import-table.js

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Flags: --expose-wasm
 
 load("test/mjsunit/wasm/wasm-constants.js");
 load("test/mjsunit/wasm/wasm-module-builder.js");
 
 function testCallImport(func, check) {
   var builder = new WasmModuleBuilder();
 
   var sig_index = builder.addType(kSig_i_dd);
-  builder.addImport("func", sig_index);
+  builder.addImport("q", "func", sig_index);
   builder.addFunction("main", sig_index)
     .addBody([
       kExprGetLocal, 0,            // --
       kExprGetLocal, 1,            // --
       kExprCallFunction, 0])         // --
     .exportAs("main");
 
-  var main = builder.instantiate({func: func}).exports.main;
+  var main = builder.instantiate({q: {func: func}}).exports.main;
 
   for (var i = 0; i < 100000; i += 10003) {
     var a = 22.5 + i, b = 10.5 + i;
     var r = main(a, b);
     check(r, a, b);
   }
 }
 
 var global = (function() { return this; })();
 var params = [-99, -99, -99, -99];
@@ skipping 128 matching lines @@
 testCallImport(returnValue(null), checkReturn(0));
 testCallImport(returnValue("0"), checkReturn(0));
 testCallImport(returnValue("-77"), checkReturn(-77));
 
 var objWithValueOf = {valueOf: function() { return 198; }}
 
 testCallImport(returnValue(objWithValueOf), checkReturn(198));
 
 
 function testCallBinopVoid(type, func, check) {
-  var ffi = new Object();
-
   var passed_length = -1;
   var passed_a = -1;
   var passed_b = -1;
   var args_a = -1;
   var args_b = -1;
 
-  ffi.func = function(a, b) {
+  var ffi = {q: {func: function(a, b) {
     passed_length = arguments.length;
     passed_a = a;
     passed_b = b;
     args_a = arguments[0];
     args_b = arguments[1];
-  }
+  }}};
 
   var builder = new WasmModuleBuilder();
 
-  builder.addImport("func", makeSig_v_xx(type));
+  builder.addImport("q", "func", makeSig_v_xx(type));
   builder.addFunction("main", makeSig_r_xx(kAstI32, type))
     .addBody([
       kExprGetLocal, 0,           // --
       kExprGetLocal, 1,           // --
       kExprCallFunction, 0,       // --
       kExprI8Const, 99,           // --
     ])
     .exportFunc("main");
 
   var main = builder.instantiate(ffi).exports.main;
@@ skipping 34 matching lines @@
 
 testCallBinopVoid(kAstI32);
 // TODO testCallBinopVoid(kAstI64);
 testCallBinopVoid(kAstF32);
 testCallBinopVoid(kAstF64);
 
 
 
 function testCallPrint() {
   var builder = new WasmModuleBuilder();
-  builder.addImport("print", makeSig_v_x(kAstI32));
-  builder.addImport("print", makeSig_r_x(kAstF64, kAstF64));
+  builder.addImport("q", "print", makeSig_v_x(kAstI32));
+  builder.addImport("q", "print", makeSig_r_x(kAstF64, kAstF64));
   builder.addFunction("main", makeSig_r_x(kAstF64, kAstF64))
     .addBody([
       kExprI8Const, 97,             // --
       kExprCallFunction, 0,  // --
       kExprGetLocal, 0,             // --
       kExprCallFunction, 1   // --
     ])
     .exportFunc();
 
-  var main = builder.instantiate({print: print}).exports.main;
+  var main = builder.instantiate({q: {print: print}}).exports.main;
 
   for (var i = -9; i < 900; i += 16.125) {
     main(i);
   }
 }
 
 testCallPrint();
 testCallPrint();
 
 
 function testCallImport2(foo, bar, expected) {
   var builder = new WasmModuleBuilder();
 
-  builder.addImport("foo", kSig_i_v);
-  builder.addImport("bar", kSig_i_v);
+  builder.addImport("q", "foo", kSig_i_v);
+  builder.addImport("t", "bar", kSig_i_v);
   builder.addFunction("main", kSig_i_v)
     .addBody([
       kExprCallFunction, 0, // --
       kExprCallFunction, 1, // --
       kExprI32Add,                 // --
     ])                             // --
     .exportFunc();
 
-  var main = builder.instantiate({foo: foo, bar: bar}).exports.main;
+  var main = builder.instantiate({q: {foo: foo}, t: {bar: bar}}).exports.main;
   assertEquals(expected, main());
 }
 
 testCallImport2(function() { return 33; }, function () { return 44; }, 77);
 
 
 function testImportName(name) {
   var builder = new WasmModuleBuilder();
-  builder.addImportWithModule("M", name, kSig_i_v);
+  builder.addImport("M", name, kSig_i_v);
   builder.addFunction("main", kSig_i_v)
     .addBody([
       kExprCallFunction, 0
     ])
     .exportFunc();
 
   let main = builder.instantiate({M: {[name]: () => 42}}).exports.main;
   assertEquals(42, main());
 }
 
 testImportName("bla");
 testImportName("0");
 testImportName("  a @#$2 324 ");
 // TODO(bradnelson): This should succeed.
 // testImportName("");