[GR-25198] Correctly handle foreign null this in non-strict functions.

PullRequest: js/1621

Author: gilles-duboscq

graal-js/src/com.oracle.truffle.js.scriptengine.test/src/com/oracle/truffle/js/scriptengine/test/GR25198.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2020, 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.truffle.js.scriptengine.test;
+
+import static org.junit.Assert.assertEquals;
+
+import javax.script.Invocable;
+import javax.script.ScriptEngine;
+import javax.script.ScriptException;
+
+import org.junit.Test;
+
+import com.oracle.truffle.js.scriptengine.GraalJSScriptEngine;
+
+public class GR25198 {
+
+    static void defineAlert(ScriptEngine engine) throws ScriptException {
+        try {
+            // @formatter:off
+            Object defineAlert = engine.eval(""
+                + "(function(out) {\n"
+                + "  this.alert = function(msg) {\n"
+                + "    return msg;\n"
+                + " };"
+                + "});"
+            );
+            // @formatter:on
+            ((Invocable) engine).invokeMethod(defineAlert, "call", null, "out");
+            assertEquals("red", ((Invocable) engine).invokeFunction("alert", "red"));
+        } catch (NoSuchMethodException ex) {
+            throw new ScriptException(ex);
+        }
+    }
+
+    @Test
+    public void testNullThis() throws ScriptException {
+        try (GraalJSScriptEngine engine = GraalJSScriptEngine.create(null, TestUtil.newContextBuilder())) {
+            defineAlert(engine);
+        }
+    }
+}

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/cast/JSPrepareThisNode.java

@@ -40,9 +40,13 @@
  */
 package com.oracle.truffle.js.nodes.cast;
 
+import java.util.Set;
+
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.instrumentation.Tag;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.js.nodes.JavaScriptNode;
 import com.oracle.truffle.js.nodes.access.GlobalObjectNode;
@@ -58,8 +62,6 @@
 import com.oracle.truffle.js.runtime.builtins.JSSymbol;
 import com.oracle.truffle.js.runtime.objects.JSLazyString;
 
-import java.util.Set;
-
 /**
  * Implementation of ECMAScript 5.1, 10.4.3 Entering Function Code, for non-strict callees.
  *
@@ -136,8 +138,12 @@ protected DynamicObject doSymbol(Symbol value) {
         return JSSymbol.create(context, value);
     }
 
-    @Specialization(guards = "isForeignObject(object)")
-    protected Object doForeignObject(Object object) {
+    @Specialization(guards = "isForeignObject(object)", limit = "5")
+    protected Object doForeignObject(Object object,
+                    @CachedLibrary("object") InteropLibrary interop) {
+        if (interop.isNull(object)) {
+            return GlobalObjectNode.getGlobalObject(context);
+        }
         return object;
     }