[GR-22832] Backport: JavaScript objects are not instances of foreign objects.

PullRequest: js/1479

Author: gilles-duboscq

common.jsonnet

@@ -1,7 +1,7 @@
 {
-  local labsjdk8 = {name: 'oraclejdk', version: '8u241-jvmci-20.1-b01', platformspecific: true},
+  local labsjdk8 = {name: 'oraclejdk', version: '8u251+08-jvmci-20.1-b02', platformspecific: true},
 
-  local labsjdk_ce_11 = {name : 'labsjdk', version : 'ce-11.0.6+9-jvmci-20.1-b01', platformspecific: true},
+  local labsjdk_ce_11 = {name : 'labsjdk', version : 'ce-11.0.7+10-jvmci-20.1-b02', platformspecific: true},
 
   jdk8: {
     downloads+: {

graal-js/src/com.oracle.truffle.js.test/js/interop/instanceof.js

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2020, 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+ */
+
+load('../assert.js');
+
+for (type of [java.lang.Runnable, java.beans.BeanInfo, java.lang.Math]) {
+    assertFalse(null instanceof type);
+    assertFalse(undefined instanceof type);
+    assertFalse(true instanceof type);
+    assertFalse(42 instanceof type);
+    assertFalse(42n instanceof type);
+    assertFalse("foo" instanceof type);
+    assertFalse(Symbol.toStringTag instanceof type);
+    assertFalse({} instanceof type);
+    assertFalse(function() {} instanceof type);
+}
+var stringBuilder = new java.lang.StringBuilder();
+assertTrue(stringBuilder instanceof java.lang.StringBuilder);
+assertTrue(stringBuilder instanceof java.lang.CharSequence);
+assertTrue(stringBuilder instanceof java.lang.Object);
+assertFalse(stringBuilder instanceof java.lang.Runnable);
+
+true;

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/binary/InstanceofNode.java

@@ -43,20 +43,17 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.instrumentation.Tag;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.CachedLibrary;
-import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
-import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.js.nodes.JavaScriptBaseNode;
 import com.oracle.truffle.js.nodes.JavaScriptNode;
 import com.oracle.truffle.js.nodes.access.GetMethodNode;
@@ -67,6 +64,7 @@
 import com.oracle.truffle.js.nodes.binary.InstanceofNodeGen.OrdinaryHasInstanceNodeGen;
 import com.oracle.truffle.js.nodes.cast.JSToBooleanNode;
 import com.oracle.truffle.js.nodes.function.JSFunctionCallNode;
+import com.oracle.truffle.js.runtime.BigInt;
 import com.oracle.truffle.js.runtime.Errors;
 import com.oracle.truffle.js.runtime.JSArguments;
 import com.oracle.truffle.js.runtime.JSContext;
@@ -151,12 +149,42 @@ private static boolean isCallable(DynamicObject target, BranchProfile proxyBranc
     }
 
     @Specialization(guards = {"isNullOrUndefined(target)"})
-    protected boolean doInvalidTarget(@SuppressWarnings("unused") Object obj, Object target) {
+    protected boolean doNullOrUndefinedTarget(@SuppressWarnings("unused") Object obj, DynamicObject target) {
         throw Errors.createTypeErrorInvalidInstanceofTarget(target, this);
     }
 
-    @Specialization(guards = {"!isJSType(target)"}, limit = "3")
-    protected boolean doForeignTarget(@SuppressWarnings("unused") Object instance, Object target,
+    @Specialization()
+    protected boolean doStringTarget(@SuppressWarnings("unused") Object obj, String target) {
+        throw Errors.createTypeErrorInvalidInstanceofTarget(target, this);
+    }
+
+    @Specialization()
+    protected boolean doDoubleTarget(@SuppressWarnings("unused") Object obj, double target) {
+        throw Errors.createTypeErrorInvalidInstanceofTarget(target, this);
+    }
+
+    @Specialization()
+    protected boolean doBooleanTarget(@SuppressWarnings("unused") Object obj, boolean target) {
+        throw Errors.createTypeErrorInvalidInstanceofTarget(target, this);
+    }
+
+    @Specialization()
+    protected boolean doBigIntTarget(@SuppressWarnings("unused") Object obj, BigInt target) {
+        throw Errors.createTypeErrorInvalidInstanceofTarget(target, this);
+    }
+
+    @Specialization()
+    protected boolean doSymbolTarget(@SuppressWarnings("unused") Object obj, Symbol target) {
+        throw Errors.createTypeErrorInvalidInstanceofTarget(target, this);
+    }
+
+    @Specialization(guards = {"isForeignObject(target)", "isJSType(instance)"})
+    protected boolean doForeignTargetJSType(@SuppressWarnings("unused") DynamicObject instance, @SuppressWarnings("unused") Object target) {
+        return false;
+    }
+
+    @Specialization(guards = {"isForeignObject(target)", "!isJSType(instance)"}, limit = "3")
+    protected boolean doForeignTargetOther(Object instance, Object target,
                     @CachedLibrary("target") InteropLibrary interop) {
         try {
             return interop.isMetaInstance(target, instance);
@@ -165,15 +193,6 @@ protected boolean doForeignTarget(@SuppressWarnings("unused") Object instance, O
         }
     }
 
-    @TruffleBoundary
-    private static String functionToString(DynamicObject fnObj) {
-        assert JSFunction.isJSFunction(fnObj);
-        RootCallTarget dct = (RootCallTarget) JSFunction.getCallTarget(fnObj);
-        RootNode rn = dct.getRootNode();
-        SourceSection ssect = rn.getSourceSection();
-        return ((ssect == null || !ssect.isAvailable()) ? "function " + JSFunction.getName(fnObj) + "() { [native code] }" : ssect.getCharacters().toString());
-    }
-
     @Override
     protected JavaScriptNode copyUninitialized(Set<Class<? extends Tag>> materializedTags) {
         return InstanceofNodeGen.create(context, cloneUninitialized(getLeft(), materializedTags), cloneUninitialized(getRight(), materializedTags));