Handling more cases.

Author: ppisl

graalpython/com.oracle.graal.python.test/src/tests/test_interop.py

@@ -490,9 +490,17 @@ def test_java_null_is_none():
             assert (x is z) == False
             assert x is not z
 
-    def test_isinstance():
+    def test_isinstance01():
         if sys.graal_python_jython_emulation_enabled:
             import java.lang.Integer as Integer
             i = Integer(1)
             assert isinstance(i, Integer)
+
+    def test_isinstance02():
+        if sys.graal_python_jython_emulation_enabled:
+            import java.util.Map as Map
+            import java.util.HashMap as HashMap
+            h = HashMap()
+            assert isinstance(h, HashMap)
+            assert isinstance(h, Map)
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

@@ -180,6 +180,7 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.Truffle;
+import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.debug.Debugger;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
@@ -203,6 +204,8 @@
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.Source;
+import java.util.HashMap;
+import java.util.Map;
 
 @CoreFunctions(defineModule = BuiltinNames.BUILTINS)
 public final class BuiltinFunctions extends PythonBuiltins {
@@ -1113,9 +1116,11 @@ protected boolean emulateJython() {
 
         @Fallback
         boolean isInstance(VirtualFrame frame, Object instance, Object cls) {
-            if (emulateJython() && getContext().getEnv().isHostObject(cls)) {
-                Object hostType = getContext().getEnv().asHostObject(cls);
-                return instance.getClass().isAssignableFrom((Class<?>) hostType);
+            TruffleLanguage.Env env = getContext().getEnv();
+            if (emulateJython() && env.isHostObject(cls)) {
+                Object hostCls = env.asHostObject(cls);
+                Object hostInstance = env.isHostObject(instance) ? env.asHostObject(instance) : instance;
+                return hostCls instanceof Class && ((Class<?>) hostCls).isAssignableFrom(hostInstance.getClass());
             }
             return isInstanceCheckInternal(frame, instance, cls) || typeInstanceCheckNode.executeWith(frame, cls, instance);
         }