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

test/mjsunit/wasm/ffi.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 --allow-natives-syntax
 
 load("test/mjsunit/wasm/wasm-constants.js");
 load("test/mjsunit/wasm/wasm-module-builder.js");
 
 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,            // --
       kExprGetLocal, 1,            // --
       kExprCallFunction, 0  // --
     ])        // --
     .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;
     var r = main(a, b);
     if (check) {
       check(r, a, b);
     }
   }
 }
 
 var global = (function() { return this; })();
 var params = [-99, -99, -99, -99, -99];
 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;
   params[2] = b;
   return (a - b) | 0;
 }
 
 function check_FOREIGN_SUB(r, a, b) {
     assertEquals(a - b | 0, r);
     assertTrue(was_called);
@@ skipping 17 matching lines @@
 var bind_sub = FOREIGN_SUB.bind();
 testCallFFI(bind_sub, check_FOREIGN_SUB);
 
 var main_for_constructor_test;
 print("Constructor");
 (function testCallConstructor() {
   class C {}
   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,            // --
       kExprGetLocal, 1,            // --
       kExprCallFunction, 0  // --
     ])        // --
     .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);
 }) ();
 
 print("Native function");
 (function test_ffi_call_to_native() {
 
   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.
   assertEquals(NaN, main());
 })();
 
 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;
   params[2] = b;
   params[3] = c;
   params[4] = d;
   return (a * b * 6) | 0;
 }
 
 function check_FOREIGN_ABCD(r, a, b) {
@@ skipping 90 matching lines @@
 // Check that returning weird values doesn't crash
 testCallFFI(returnValue(undefined), checkReturn(0));
 testCallFFI(returnValue(null), checkReturn(0));
 testCallFFI(returnValue("0"), checkReturn(0));
 testCallFFI(returnValue("-77"), checkReturn(-77));
 
 var objWithValueOf = {valueOf: function() { return 198; }}
 
 testCallFFI(returnValue(objWithValueOf), checkReturn(198));
 
-
 function testCallBinopVoid(type, func, check) {
   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) {
+  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,            // --
       kExprGetLocal, 1,            // --
       kExprCallFunction, 0,        // --
       kExprI8Const, 99             // --
     ])                             // --
     .exportFunc()
 
   var main = builder.instantiate(ffi).exports.main;
@@ skipping 30 matching lines @@
     assertEquals(expected_b, passed_b);
   }
 }
 
 
 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_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,      // --
       kExprCallFunction, 0,  // --
       kExprGetLocal, 0,      // --
       kExprCallFunction, 1   // --
     ])                       // --
     .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},
     0: {0: print, foo: print},
     18: {'-3': print},
     '-3': {18: print}
   });
 })();
 
 (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();
   var num_valueOf = 0;
   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();
   assertEquals(2, num_valueOf);
 })();
 
 (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();
   var num_valueOf = 0;
   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);
 })();