Correction of the handling of PropertyProxy in KeyInfoNode.

(cherry picked from commit 721827b)

Author: iamstolis

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

@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2021, 2021, 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.assertNull;
+
+import javax.script.Invocable;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+
+import org.junit.Test;
+
+public class GR29073 {
+
+    @Test
+    public void test() throws ScriptException {
+        ScriptEngineManager manager = new ScriptEngineManager();
+        ScriptEngine engine = manager.getEngineByName(TestEngine.TESTED_ENGINE_NAME);
+        Object array = engine.eval("[]");
+        ArrayLike arrayLike = ((Invocable) engine).getInterface(array, ArrayLike.class);
+        assertNull(arrayLike);
+    }
+
+    public interface ArrayLike {
+        int length();
+    }
+
+}

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/interop/KeyInfoNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, 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
@@ -48,6 +48,7 @@
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectLibrary;
 import com.oracle.truffle.api.object.Property;
+import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.js.nodes.JavaScriptBaseNode;
 import com.oracle.truffle.js.nodes.access.GetPrototypeNode;
 import com.oracle.truffle.js.nodes.access.IsExtensibleNode;
@@ -58,6 +59,7 @@
 import com.oracle.truffle.js.runtime.objects.JSProperty;
 import com.oracle.truffle.js.runtime.objects.Null;
 import com.oracle.truffle.js.runtime.objects.PropertyDescriptor;
+import com.oracle.truffle.js.runtime.objects.PropertyProxy;
 import com.oracle.truffle.js.runtime.objects.Undefined;
 
 /**
@@ -83,7 +85,8 @@ public abstract class KeyInfoNode extends JavaScriptBaseNode {
     static boolean cachedOwnProperty(DynamicObject target, String key, int query,
                     @CachedLibrary("target") DynamicObjectLibrary objectLibrary,
                     @Bind("objectLibrary.getProperty(target, key)") Property property,
-                    @Cached IsCallableNode isCallable) {
+                    @Cached IsCallableNode isCallable,
+                    @Cached BranchProfile proxyBranch) {
         if (JSProperty.isAccessor(property)) {
             Accessor accessor = (Accessor) objectLibrary.getOrDefault(target, key, null);
             if ((query & READABLE) != 0 && accessor.hasGetter()) {
@@ -110,8 +113,15 @@ static boolean cachedOwnProperty(DynamicObject target, String key, int query,
             if ((query & MODIFIABLE) != 0 && JSProperty.isWritable(property)) {
                 return true;
             }
-            if ((query & INVOCABLE) != 0 && isCallable.executeBoolean(objectLibrary.getOrDefault(target, key, Undefined.instance))) {
-                return true;
+            if ((query & INVOCABLE) != 0) {
+                Object value = objectLibrary.getOrDefault(target, key, Undefined.instance);
+                if (JSProperty.isProxy(property)) {
+                    proxyBranch.enter();
+                    value = ((PropertyProxy) value).get(target);
+                }
+                if (isCallable.executeBoolean(value)) {
+                    return true;
+                }
             }
             if ((query & REMOVABLE) != 0 && JSProperty.isConfigurable(property)) {
                 return true;