[wasm] Fix receiver conversion for WASM->JS calls.

R=yangguo@chromium.org,ahaas@chromium.org
BUG=chromium:624713
LOG=Y

Review-Url: https://codereview.chromium.org/2111843002
Cr-Commit-Position: refs/heads/master@{#37428}

src/compiler/wasm-compiler.cc

@@ -2605,9 +2605,12 @@ void WasmGraphBuilder::BuildWasmToJSWrapper(Handle<JSFunction> function,
   if (arg_count_before_args) {
     args[pos++] = jsgraph()->Int32Constant(wasm_count);  // argument count
   }
-  // JS receiver.
-  Handle<Object> global(function->context()->global_object(), isolate);
-  args[pos++] = jsgraph()->Constant(global);
+  // Create the receiver constant (either undefined or the global proxy).
+  Handle<Object> receiver(isolate->heap()->undefined_value(), isolate);
+  if (is_sloppy(function->shared()->language_mode())) {
+    receiver = Handle<Object>(function->context()->global_proxy(), isolate);
+  }
+  args[pos++] = jsgraph()->Constant(receiver);
 
   // Convert WASM numbers to JS values.
   int param_index = 0;

test/mjsunit/wasm/import-table.js

@@ -45,7 +45,7 @@ function FOREIGN_SUB(a, b) {
 function check_FOREIGN_SUB(r, a, b) {
     assertEquals(a - b | 0, r);
     assertTrue(was_called);
-//    assertEquals(global, params[0]);  // sloppy mode
+    assertEquals(global, params[0]);  // sloppy mode
     assertEquals(a, params[1]);
     assertEquals(b, params[2]);
     was_called = false;
@@ -68,7 +68,7 @@ function FOREIGN_ABCD(a, b, c, d) {
 function check_FOREIGN_ABCD(r, a, b) {
     assertEquals((a * b * 6) | 0, r);
     assertTrue(was_called);
-//    assertEquals(global, params[0]);  // sloppy mode.
+    assertEquals(global, params[0]);  // sloppy mode.
     assertEquals(a, params[1]);
     assertEquals(b, params[2]);
     assertEquals(undefined, params[3]);

test/mjsunit/wasm/receiver.js

+// Copyright 2016 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, expected, a, b) {
+  var builder = new WasmModuleBuilder();
+
+  var sig_index = builder.addType(kSig_i_dd);
+  builder.addImport("func", sig_index);
+  builder.addFunction("main", sig_index)
+    .addBody([
+      kExprGetLocal, 0,            // --
+      kExprGetLocal, 1,            // --
+      kExprCallImport, 2, 0])      // --
+    .exportAs("main");
+
+  var main = builder.instantiate({func: func}).exports.main;
+
+  assertEquals(expected, main(a, b));
+}
+
+var global = (function() { return this; })();
+
+function sloppyReceiver(a, b) {
+  assertEquals(global, this);
+  assertEquals(33.3, a);
+  assertEquals(44.4, b);
+  return 11;
+}
+
+function strictReceiver(a, b) {
+  'use strict';
+  assertEquals(undefined, this);
+  assertEquals(55.5, a);
+  assertEquals(66.6, b);
+  return 22;
+}
+
+testCallImport(sloppyReceiver, 11, 33.3, 44.4);
+testCallImport(strictReceiver, 22, 55.5, 66.6);