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

test/mjsunit/wasm/ffi.js

Index: test/mjsunit/wasm/ffi.js
diff --git a/test/mjsunit/wasm/ffi.js b/test/mjsunit/wasm/ffi.js
index 959c659d4e5ade8e364d26014e7a5f438e2b58bb..8696bcf63d5095b8f882e4d7abded4be3c5cfe69 100644
--- a/test/mjsunit/wasm/ffi.js
+++ b/test/mjsunit/wasm/ffi.js
@@ -11,7 +11,7 @@ function testCallFFI(func, check) {
   var builder = new WasmModuleBuilder();
 
   var sig_index = builder.addType(kSig_i_dd);
-  builder.addImport("func", sig_index);
+  builder.addImport("", "func", sig_index);
   builder.addFunction("main", sig_index)
     .addBody([
       kExprGetLocal, 0,            // --
@@ -20,7 +20,7 @@ function testCallFFI(func, check) {
     ])        // --
     .exportFunc();
 
-  var main = builder.instantiate({func: func}).exports.main;
+  var main = builder.instantiate({"": {func: func}}).exports.main;
 
   for (var i = 0; i < 100000; i += 10003) {
     var a = 22.5 + i, b = 10.5 + i;
@@ -37,7 +37,7 @@ var was_called = false;
 var length = -1;
 
 function FOREIGN_SUB(a, b) {
-  print("FOREIGN_SUB(" + a + ", " + b + ")");
+//  print("FOREIGN_SUB(" + a + ", " + b + ")");
   was_called = true;
   params[0] = this;
   params[1] = a;
@@ -75,7 +75,7 @@ print("Constructor");
   var builder = new WasmModuleBuilder();
 
   var sig_index = builder.addType(kSig_i_dd);
-  builder.addImport("func", sig_index);
+  builder.addImport("", "func", sig_index);
   builder.addFunction("main", sig_index)
     .addBody([
       kExprGetLocal, 0,            // --
@@ -84,7 +84,7 @@ print("Constructor");
     ])        // --
     .exportFunc();
 
-  main_for_constructor_test = builder.instantiate({func: C}).exports.main;
+  main_for_constructor_test = builder.instantiate({"": {func: C}}).exports.main;
 
   assertThrows("main_for_constructor_test(12, 43)", TypeError);
 }) ();
@@ -95,14 +95,14 @@ print("Native function");
   var builder = new WasmModuleBuilder();
 
   var sig_index = builder.addType(kSig_d_v);
-  builder.addImport("func", sig_index);
+  builder.addImport("", "func", sig_index);
   builder.addFunction("main", sig_index)
     .addBody([
       kExprCallFunction, 0  // --
     ])        // --
     .exportFunc();
 
-  var main = builder.instantiate({func: Object.prototype.toString}).exports.main;
+  var main = builder.instantiate({"": {func: Object.prototype.toString}}).exports.main;
   // The result of the call to Object.prototype.toString should be
   // [object Undefined]. However, we cannot test for this result because wasm
   // cannot return objects but converts them to float64 in this test.
@@ -113,7 +113,7 @@ print("Callable JSObject");
 testCallFFI(%GetCallable(), function check(r, a, b) {assertEquals(a - b, r);});
 
 function FOREIGN_ABCD(a, b, c, d) {
-  print("FOREIGN_ABCD(" + a + ", " + b + ", " + c + ", " + d + ")");
+//  print("FOREIGN_ABCD(" + a + ", " + b + ", " + c + ", " + d + ")");
   was_called = true;
   params[0] = this;
   params[1] = a;
@@ -224,7 +224,6 @@ var objWithValueOf = {valueOf: function() { return 198; }}
 
 testCallFFI(returnValue(objWithValueOf), checkReturn(198));
 
-
 function testCallBinopVoid(type, func, check) {
   var passed_length = -1;
   var passed_a = -1;
@@ -232,17 +231,17 @@ function testCallBinopVoid(type, func, check) {
   var args_a = -1;
   var args_b = -1;
 
-  ffi = {func: function(a, b) {
+  ffi = {"": {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("", "func", makeSig_v_xx(type));
   builder.addFunction("main", makeSig_r_xx(kAstI32, type))
     .addBody([
       kExprGetLocal, 0,            // --
@@ -293,13 +292,11 @@ testCallBinopVoid(kAstI32);
 testCallBinopVoid(kAstF32);
 testCallBinopVoid(kAstF64);
 
-
-
 (function testCallPrint() {
   var builder = new WasmModuleBuilder();
 
-  builder.addImport("print", makeSig_v_x(kAstI32));
-  builder.addImport("print", makeSig_v_x(kAstF64));
+  builder.addImport("", "print", makeSig_v_x(kAstI32));
+  builder.addImport("", "print", makeSig_v_x(kAstF64));
   builder.addFunction("main", makeSig_v_x(kAstF64))
     .addBody([
       kExprI8Const, 97,      // --
@@ -309,27 +306,29 @@ testCallBinopVoid(kAstF64);
     ])                       // --
     .exportFunc()
 
-  var main = builder.instantiate({print: print}).exports.main;
+  var main = builder.instantiate({"": {print: print}}).exports.main;
   for (var i = -9; i < 900; i += 6.125) main(i);
 })();
 
 
 (function testImportNumbers() {
+  print("TestImportNumbers...");
   var builder = new WasmModuleBuilder();
 
-  builder.addImport('0', kSig_v_i);
+  builder.addImport("", '0', kSig_v_i);
 
-  builder.instantiate({0: print});
+  builder.instantiate({"": {0: print}});
 })();
 
 (function testImportNumbers2() {
+  print("TestImportNumbers2...");
   var builder = new WasmModuleBuilder();
 
-  builder.addImportWithModule('foo', '0', kSig_v_i);
-  builder.addImportWithModule('0', 'foo', kSig_v_i);
-  builder.addImportWithModule('0', '0', kSig_v_i);
-  builder.addImportWithModule('18', '-3', kSig_v_i);
-  builder.addImportWithModule('-3', '18', kSig_v_i);
+  builder.addImport('foo', '0', kSig_v_i);
+  builder.addImport('0', 'foo', kSig_v_i);
+  builder.addImport('0', '0', kSig_v_i);
+  builder.addImport('18', '-3', kSig_v_i);
+  builder.addImport('-3', '18', kSig_v_i);
 
   builder.instantiate({
     foo: {0: print},
@@ -340,21 +339,22 @@ testCallBinopVoid(kAstF64);
 })();
 
 (function ImportSymbolAsVoidDoesNotThrow() {
+  print("ImportSymbolAsVoidDoesNotThrow...");
   var builder = new WasmModuleBuilder();
   // Return type is void, so there should be no ToNumber conversion.
-  var index = builder.addImport("func", kSig_v_v);
+  var index = builder.addImport("", "func", kSig_v_v);
   builder.addFunction("main", kSig_v_v)
       .addBody([kExprCallFunction, 0])
       .exportFunc();
   var func = () => Symbol();
-  var main = builder.instantiate({func: func}).exports.main;
+  var main = builder.instantiate({"": {func: func}}).exports.main;
   main();
 })();
 
 (function ToNumberCalledOnImport() {
   var builder = new WasmModuleBuilder();
   // Return type is int, so there should be a ToNumber conversion.
-  var index = builder.addImport("func", kSig_i_v);
+  var index = builder.addImport("", "func", kSig_i_v);
   builder.addFunction("main", kSig_i_v)
       .addBody([kExprCallFunction, 0])
       .exportFunc();
@@ -362,7 +362,7 @@ testCallBinopVoid(kAstF64);
   function Foo() {}
   Foo.prototype.valueOf = () => ++num_valueOf;
   var func = () => new Foo();
-  var main = builder.instantiate({func: func}).exports.main;
+  var main = builder.instantiate({"": {func: func}}).exports.main;
   main();
   assertEquals(1, num_valueOf);
   main();
@@ -372,7 +372,7 @@ testCallBinopVoid(kAstF64);
 (function ToNumberNotCalledOnVoidImport() {
   var builder = new WasmModuleBuilder();
   // Return type is void, so there should be no ToNumber conversion.
-  var index = builder.addImport("func", kSig_v_v);
+  var index = builder.addImport("", "func", kSig_v_v);
   builder.addFunction("main", kSig_v_v)
       .addBody([kExprCallFunction, 0])
       .exportFunc();
@@ -380,7 +380,7 @@ testCallBinopVoid(kAstF64);
   function Foo() {}
   Foo.prototype.valueOf = () => ++num_valueOf;
   var func = () => new Foo();
-  var main = builder.instantiate({func: func}).exports.main;
+  var main = builder.instantiate({"": {func: func}}).exports.main;
   main();
   main();
   assertEquals(0, num_valueOf);