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

test/mjsunit/wasm/indirect-calls.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");
 
 var module = (function () {
   var builder = new WasmModuleBuilder();
 
   var sig_index = builder.addType(kSig_i_ii);
-  builder.addImport("add", sig_index);
+  builder.addImport("q", "add", sig_index);
   builder.addFunction("add", sig_index)
     .addBody([
       kExprGetLocal, 0, kExprGetLocal, 1, kExprCallFunction, 0
     ]);
   builder.addFunction("sub", sig_index)
     .addBody([
       kExprGetLocal, 0,             // --
       kExprGetLocal, 1,             // --
       kExprI32Sub,                  // --
     ]);
   builder.addFunction("main", kSig_i_iii)
     .addBody([
       kExprGetLocal, 1,
       kExprGetLocal, 2,
       kExprGetLocal, 0,
       kExprCallIndirect, sig_index, kTableZero
     ])
     .exportFunc()
   builder.appendToTable([1, 2, 3]);
 
-  return builder.instantiate({add: function(a, b) { return a + b | 0; }});
+  return builder.instantiate({q: {add: function(a, b) { return a + b | 0; }}});
 })();
 
 // Check the module exists.
 assertFalse(module === undefined);
 assertFalse(module === null);
 assertFalse(module === 0);
 assertEquals("object", typeof module.exports);
 assertEquals("function", typeof module.exports.main);
 
 assertEquals(5, module.exports.main(1, 12, 7));
 assertEquals(19, module.exports.main(0, 12, 7));
 
 assertTraps(kTrapFuncSigMismatch, "module.exports.main(2, 12, 33)");
 assertTraps(kTrapFuncInvalid, "module.exports.main(3, 12, 33)");
 
 
 module = (function () {
   var builder = new WasmModuleBuilder();
 
   var sig_i_ii = builder.addType(kSig_i_ii);
   var sig_i_i = builder.addType(kSig_i_i);
-  var mul = builder.addImport("mul", sig_i_ii);
+  var mul = builder.addImport("q", "mul", sig_i_ii);
   var add = builder.addFunction("add", sig_i_ii)
     .addBody([
       kExprGetLocal, 0,  // --
       kExprGetLocal, 1,  // --
       kExprI32Add        // --
     ]);
   var popcnt = builder.addFunction("popcnt", sig_i_i)
     .addBody([
       kExprGetLocal, 0,  // --
       kExprI32Popcnt     // --
     ]);
   var main = builder.addFunction("main", kSig_i_iii)
     .addBody([
       kExprGetLocal, 1,
       kExprGetLocal, 2,
       kExprGetLocal, 0,
       kExprCallIndirect, sig_i_ii, kTableZero
     ])
     .exportFunc();
   builder.appendToTable([mul.index, add.index, popcnt.index, main.index]);
 
-  return builder.instantiate({mul: function(a, b) { return a * b | 0; }});
+  return builder.instantiate({q: {mul: function(a, b) { return a * b | 0; }}});
 })();
 
 assertEquals(-6, module.exports.main(0, -2, 3));
 assertEquals(99, module.exports.main(1, 22, 77));
 assertTraps(kTrapFuncSigMismatch, "module.exports.main(2, 12, 33)");
 assertTraps(kTrapFuncSigMismatch, "module.exports.main(3, 12, 33)");
 assertTraps(kTrapFuncInvalid, "module.exports.main(4, 12, 33)");
 
 function AddFunctions(builder) {
   var mul = builder.addFunction("mul", kSig_i_ii)
@@ skipping 88 matching lines @@
   var f = AddFunctions(builder);
   builder.addFunction("main", kSig_i_ii)
     .addBody([
       kExprI32Const, 33,  // --
       kExprGetLocal, 0,   // --
       kExprGetLocal, 1,   // --
       kExprCallIndirect, 0, kTableZero])  // --
     .exportAs("main");
 
   builder.setFunctionTableLength(10);
-  var g = builder.addImportedGlobal("base", undefined, kAstI32);
+  var g = builder.addImportedGlobal("fff", "base", kAstI32);
   builder.addFunctionTableInit(g, true, [f.mul.index, f.add.index, f.sub.index]);
 
   var module = new WebAssembly.Module(builder.toBuffer());
 
   for (var i = 0; i < 5; i++) {
     print(" base = " + i);
-    var instance = new WebAssembly.Instance(module, {base: i});
+    var instance = new WebAssembly.Instance(module, {fff: {base: i}});
     main = instance.exports.main;
     for (var j = 0; j < i; j++) {
       assertTraps(kTrapFuncSigMismatch, "main(12, " + j + ")");
     }
     assertEquals(33, main(1, i + 0));
     assertEquals(66, main(2, i + 0));
     assertEquals(34, main(1, i + 1));
     assertEquals(35, main(2, i + 1));
     assertEquals(32, main(1, i + 2));
     assertEquals(31, main(2, i + 2));
     assertTraps(kTrapFuncInvalid, "main(12, 10)");
   }
 })();