Skip to content

Commit 3359598

Browse files
committed
[GR-24389] Improve foreign object prototype.
PullRequest: js/1588
2 parents 85aa7f8 + bb76ccc commit 3359598

File tree

8 files changed

+243
-53
lines changed

8 files changed

+243
-53
lines changed

graal-js/src/com.oracle.truffle.js.test.sdk/src/com/oracle/truffle/js/test/sdk/tck/JavaScriptTCKLanguageProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ public Collection<? extends Snippet> createExpressions(final Context context) {
208208
// in
209209
ops.add(createBinaryOperator(context, "in", TypeDescriptor.BOOLEAN,
210210
ANY,
211-
TypeDescriptor.union(TypeDescriptor.OBJECT, TypeDescriptor.ARRAY)));
211+
TypeDescriptor.union(TypeDescriptor.OBJECT, TypeDescriptor.ARRAY, TypeDescriptor.EXECUTABLE_ANY)));
212212
// instanceof
213213
ops.add(createBinaryOperator(context, "instanceof", TypeDescriptor.BOOLEAN, ANY, TypeDescriptor.META_OBJECT));
214214

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
/*
2+
* Copyright (c) 2020, 2020, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* The Universal Permissive License (UPL), Version 1.0
6+
*
7+
* Subject to the condition set forth below, permission is hereby granted to any
8+
* person obtaining a copy of this software, associated documentation and/or
9+
* data (collectively the "Software"), free of charge and under any and all
10+
* copyright rights in the Software, and any and all patent rights owned or
11+
* freely licensable by each licensor hereunder covering either (i) the
12+
* unmodified Software as contributed to or provided by such licensor, or (ii)
13+
* the Larger Works (as defined below), to deal in both
14+
*
15+
* (a) the Software, and
16+
*
17+
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
18+
* one is included with the Software each a "Larger Work" to which the Software
19+
* is contributed by such licensors),
20+
*
21+
* without restriction, including without limitation the rights to copy, create
22+
* derivative works of, display, perform, and distribute the Software and make,
23+
* use, sell, offer for sale, import, export, have made, and have sold the
24+
* Software and the Larger Work(s), and to sublicense the foregoing rights on
25+
* either these or other terms.
26+
*
27+
* This license is subject to the following condition:
28+
*
29+
* The above copyright notice and either this complete permission notice or at a
30+
* minimum a reference to the UPL must be included in all copies or substantial
31+
* portions of the Software.
32+
*
33+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
36+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39+
* SOFTWARE.
40+
*/
41+
package com.oracle.truffle.js.test.interop;
42+
43+
import static com.oracle.truffle.js.lang.JavaScriptLanguage.ID;
44+
import static com.oracle.truffle.js.runtime.JSContextOptions.FOREIGN_OBJECT_PROTOTYPE_NAME;
45+
import static org.junit.Assert.assertEquals;
46+
import static org.junit.Assert.assertFalse;
47+
import static org.junit.Assert.assertTrue;
48+
49+
import java.util.Arrays;
50+
import java.util.List;
51+
52+
import org.graalvm.polyglot.Context;
53+
import org.graalvm.polyglot.HostAccess;
54+
import org.graalvm.polyglot.Value;
55+
import org.graalvm.polyglot.proxy.ProxyArray;
56+
import org.graalvm.polyglot.proxy.ProxyExecutable;
57+
import org.junit.Test;
58+
59+
import com.oracle.truffle.js.test.JSTest;
60+
61+
public class ForeignObjectPrototypeTest {
62+
63+
@Test
64+
public void testProxyArray() {
65+
try (Context context = JSTest.newContextBuilder(ID).option(FOREIGN_OBJECT_PROTOTYPE_NAME, "true").build()) {
66+
ProxyArray array = ProxyArray.fromArray("fun", "with", "proxy", "array");
67+
Value result = context.eval(ID, "(array) => array.sort()").execute(array);
68+
assertEquals(Arrays.asList("array", "fun", "proxy", "with"), result.as(List.class));
69+
70+
array = ProxyArray.fromArray(4, 5, 6, 1, 2, 3, 7, 8, 9);
71+
result = context.eval(ID, "(array) => array.reduce((a,b) => a + b)").execute(array);
72+
assertEquals(45, result.asInt());
73+
}
74+
}
75+
76+
@Test
77+
public void testHostArray() {
78+
try (Context context = JSTest.newContextBuilder(ID).option(FOREIGN_OBJECT_PROTOTYPE_NAME, "true").allowHostAccess(HostAccess.ALL).build()) {
79+
Value array = context.asValue(new String[]{"fun", "with", "proxy", "array"});
80+
Value result = context.eval(ID, "(array) => array.sort()").execute(array);
81+
assertEquals(Arrays.asList("array", "fun", "proxy", "with"), result.as(List.class));
82+
83+
array = context.asValue(new int[]{4, 5, 6, 1, 2, 3, 7, 8, 9});
84+
result = context.eval(ID, "(array) => array.reduce((a,b) => a + b)").execute(array);
85+
assertEquals(45, result.asInt());
86+
result = context.eval(ID, "(array) => array.sort()").execute(array);
87+
assertEquals(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9), result.as(List.class));
88+
}
89+
}
90+
91+
@Test
92+
public void testProxyExecutable() {
93+
try (Context context = JSTest.newContextBuilder(ID).option(FOREIGN_OBJECT_PROTOTYPE_NAME, "true").build()) {
94+
context.getBindings(ID).putMember("moo", (ProxyExecutable) args -> {
95+
assertEquals(3, args.length);
96+
assertTrue(args[0].isString());
97+
assertTrue(args[1].isNumber());
98+
assertTrue(args[2].isBoolean());
99+
assertEquals("foo", args[0].asString());
100+
assertEquals(123, args[1].asInt());
101+
assertTrue(args[2].asBoolean());
102+
return "hi";
103+
});
104+
Value value = context.eval("js", "(function(...args) { return moo.apply(null, args); })('foo', 123, true)");
105+
assertTrue(value.isString());
106+
assertEquals("hi", value.asString());
107+
}
108+
}
109+
110+
@Test
111+
public void testHostMethodStatic() {
112+
try (Context context = JSTest.newContextBuilder(ID).option(FOREIGN_OBJECT_PROTOTYPE_NAME, "true").allowHostAccess(HostAccess.ALL).allowHostClassLookup(s -> true).build()) {
113+
Value method = context.eval(ID, "Java.type('java.util.Arrays').asList");
114+
assertTrue(method.canExecute());
115+
assertFalse(method.hasMembers());
116+
Value result = context.eval(ID, "m => m.call(null, 0, 8, 1, 5)").execute(method);
117+
assertEquals(Arrays.asList(0, 8, 1, 5), result.as(List.class));
118+
result = context.eval(ID, "m => m.apply(null, [0, 8, 1, 5])").execute(method);
119+
assertEquals(Arrays.asList(0, 8, 1, 5), result.as(List.class));
120+
}
121+
}
122+
123+
}

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/builtins/ObjectPrototypeBuiltins.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,8 @@ protected String doForeignObject(Object thisObj,
339339
return "[object Array]";
340340
} else if (interop.isExecutable(thisObj) || interop.isInstantiable(thisObj)) {
341341
return "[object Function]";
342+
} else if (interop.isInstant(thisObj)) {
343+
return "[object Date]";
342344
} else {
343345
return "[object Object]";
344346
}

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/access/JSHasPropertyNode.java

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,7 @@ public boolean foreignObject(Object object, Object propertyName,
174174
@Cached("create()") ForeignObjectPrototypeNode foreignObjectPrototypeNode,
175175
@Cached("create()") JSHasPropertyNode hasInPrototype,
176176
@CachedLanguage LanguageReference<JavaScriptLanguage> languageRef) {
177-
if (!interop.isNull(object) && ((interop.hasMembers(object) && !interop.isBoolean(object) && !interop.isString(object) && !interop.isNumber(object)) || interop.hasArrayElements(object) ||
178-
(interop.isExecutable(object) && languageRef.get().getJSContext().getContextOptions().hasForeignObjectPrototype()))) {
177+
if (isForeignValueOfTypeObject(object, interop)) {
179178
if (propertyName instanceof Number && interop.hasArrayElements(object)) {
180179
long index = JSRuntime.longValue((Number) propertyName);
181180
return index >= 0 && index < JSInteropUtil.getArraySize(object, interop, this);
@@ -195,6 +194,20 @@ public boolean foreignObject(Object object, Object propertyName,
195194
}
196195
}
197196

197+
private static boolean isForeignValueOfTypeObject(Object object, InteropLibrary interop) {
198+
if (interop.isNull(object)) {
199+
return false;
200+
} else if (interop.hasMembers(object) && !interop.isBoolean(object) && !interop.isString(object) && !interop.isNumber(object)) {
201+
return true;
202+
} else if (interop.hasArrayElements(object)) {
203+
return true;
204+
} else if (interop.isExecutable(object)) {
205+
return true;
206+
} else {
207+
return false;
208+
}
209+
}
210+
198211
@Specialization(guards = "isJSType(object)")
199212
public boolean objectObject(DynamicObject object, Object propertyName,
200213
@Cached("create()") JSToPropertyKeyNode toPropertyKeyNode) {

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/access/PropertyGetNode.java

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -908,11 +908,13 @@ public static final class ForeignPropertyGetNode extends LinkedPropertyGetNode {
908908
private final boolean isLength;
909909
private final boolean isMethod;
910910
private final boolean isGlobal;
911-
@CompilationFinal private boolean optimistic = true;
912911
private final JSContext context;
913912
@Child private InteropLibrary interop;
914913
@Child private InteropLibrary getterInterop;
915914

915+
private final BranchProfile errorBranch = BranchProfile.create();
916+
@CompilationFinal private boolean optimistic = true;
917+
916918
public ForeignPropertyGetNode(Object key, boolean isMethod, boolean isGlobal, JSContext context) {
917919
super(new ForeignLanguageCheckNode());
918920
this.context = context;
@@ -926,6 +928,7 @@ public ForeignPropertyGetNode(Object key, boolean isMethod, boolean isGlobal, JS
926928
private Object foreignGet(Object thisObj, PropertyGetNode root) {
927929
Object key = root.getKey();
928930
if (interop.isNull(thisObj)) {
931+
errorBranch.enter();
929932
throw Errors.createTypeErrorCannotGetProperty(context, key, thisObj, isMethod, this);
930933
}
931934
if (!(key instanceof String)) {
@@ -936,16 +939,10 @@ private Object foreignGet(Object thisObj, PropertyGetNode root) {
936939
if (optimistic) {
937940
try {
938941
foreignResult = interop.readMember(thisObj, stringKey);
939-
} catch (UnknownIdentifierException e) {
942+
} catch (UnknownIdentifierException | UnsupportedMessageException e) {
940943
CompilerDirectives.transferToInterpreterAndInvalidate();
941944
optimistic = false;
942-
if (context.isOptionNashornCompatibilityMode()) {
943-
foreignResult = tryInvokeGetter(thisObj, root);
944-
} else {
945-
return maybeGetFromPrototype(thisObj, key);
946-
}
947-
} catch (UnsupportedMessageException e) {
948-
return maybeGetFromPrototype(thisObj, key);
945+
foreignResult = fallback(thisObj, key, root, e instanceof UnknownIdentifierException);
949946
}
950947
} else {
951948
if (interop.isMemberReadable(thisObj, stringKey)) {
@@ -954,15 +951,21 @@ private Object foreignGet(Object thisObj, PropertyGetNode root) {
954951
} catch (UnknownIdentifierException | UnsupportedMessageException e) {
955952
return Undefined.instance;
956953
}
957-
} else if (context.isOptionNashornCompatibilityMode()) {
958-
foreignResult = tryInvokeGetter(thisObj, root);
959954
} else {
960-
return maybeGetFromPrototype(thisObj, key);
955+
foreignResult = fallback(thisObj, key, root, true);
961956
}
962957
}
963958
return importValueNode.executeWithTarget(foreignResult);
964959
}
965960

961+
private Object fallback(Object thisObj, Object key, PropertyGetNode root, boolean mayHaveMembers) {
962+
if (mayHaveMembers && context.isOptionNashornCompatibilityMode()) {
963+
return tryInvokeGetter(thisObj, root);
964+
} else {
965+
return maybeGetFromPrototype(thisObj, key);
966+
}
967+
}
968+
966969
private Object maybeGetFromPrototype(Object thisObj, Object key) {
967970
if (context.getContextOptions().hasForeignObjectPrototype()) {
968971
if (getFromPrototypeNode == null || foreignObjectPrototypeNode == null) {
@@ -1008,17 +1011,16 @@ private Object tryGetResult(Object thisObj, String prefix, PropertyGetNode root)
10081011
}
10091012
try {
10101013
return getterInterop.invokeMember(thisObj, getterKey, JSArguments.EMPTY_ARGUMENTS_ARRAY);
1011-
} catch (UnknownIdentifierException e) {
1012-
return null;
1013-
} catch (UnsupportedMessageException | UnsupportedTypeException | ArityException e) {
1014-
return Undefined.instance;
1014+
} catch (UnknownIdentifierException | UnsupportedMessageException | UnsupportedTypeException | ArityException e) {
1015+
return null; // try the next fallback
10151016
}
10161017
}
10171018

10181019
private Object getSize(Object thisObj) {
10191020
try {
10201021
return JSRuntime.longToIntOrDouble(interop.getArraySize(thisObj));
10211022
} catch (UnsupportedMessageException e) {
1023+
errorBranch.enter();
10221024
throw Errors.createTypeErrorInteropException(thisObj, e, "getArraySize", this);
10231025
}
10241026
}

0 commit comments

Comments
 (0)