Further improve 'PyType_IsSubtype'.

Author: fangerer

graalpython/com.oracle.graal.python.cext/src/capi.h

@@ -183,6 +183,18 @@ inline void* native_to_java(PyObject* obj) {
     }
 }
 
+__attribute__((always_inline))
+inline void* native_type_to_java(PyTypeObject* type) {
+	PyObject* obj = (PyObject*)type;
+	void* refcnt = obj->ob_refcnt;
+	if (!truffle_cannot_be_handle(refcnt)) {
+		return resolve_handle(cache, refcnt);
+	} else if (IS_POINTER(refcnt)) {
+		return refcnt;
+	}
+	return obj;
+}
+
 extern void* to_java(PyObject* obj);
 extern void* to_java_type(PyTypeObject* cls);
 extern PyObject* to_sulong(void *o);

graalpython/com.oracle.graal.python.cext/src/typeobject.c

@@ -54,7 +54,7 @@ PyTypeObject PySuper_Type = PY_TRUFFLE_TYPE("super", &PyType_Type, Py_TPFLAGS_DE
 
 UPCALL_ID(PyType_IsSubtype);
 int PyType_IsSubtype(PyTypeObject* a, PyTypeObject* b) {
-    return UPCALL_CEXT_I(_jls_PyType_IsSubtype, native_to_java((PyObject*)a), native_to_java((PyObject*)b));
+    return ((int (*)(void* a, void* b))_jls_PyType_IsSubtype)(native_type_to_java(a), native_type_to_java(b));
 }
 
 static int add_subclass(PyTypeObject *base, PyTypeObject *type) {

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

@@ -2042,27 +2042,28 @@ long doGeneric(Object n) {
 
     @Builtin(name = "PyType_IsSubtype", fixedNumOfPositionalArgs = 2)
     @GenerateNodeFactory
-    abstract static class PyType_IsSubtype extends PythonBinaryBuiltinNode {
-        private static long calls = 0;
+    abstract static class PyType_IsSubtype extends PythonBuiltinNode {
 
         @Child private IsSubtypeNode isSubtypeNode = IsSubtypeNode.create();
+        @Child private CExtNodes.AsPythonObjectNode asPythonObjectNode = CExtNodes.AsPythonObjectNode.create();
 
-        @Specialization
-        int doI(PythonClass a, PythonClass b) {
-            calls++;
-            if (calls % 1000 == 0) {
-                print(calls);
-            }
-            if (isSubtypeNode.execute(a, b)) {
-                return 1;
-            }
-            return 0;
+        @Specialization(guards = {"a == cachedA", "b == cachedB"})
+        int doCached(@SuppressWarnings("unused") PythonNativeWrapper a, @SuppressWarnings("unused") PythonNativeWrapper b,
+                        @Cached("a") @SuppressWarnings("unused") PythonNativeWrapper cachedA,
+                        @Cached("b") @SuppressWarnings("unused") PythonNativeWrapper cachedB,
+                        @Cached("isNativeSubtype(a, b)") int result) {
+            return result;
         }
 
-        @TruffleBoundary
-        private static void print(long calls2) {
-            System.out.println("######### CALLS: " + calls2);
-            System.out.flush();
+        @Specialization(replaces = "doCached")
+        int doGeneric(PythonNativeWrapper a, PythonNativeWrapper b) {
+            return isNativeSubtype(a, b);
+        }
+
+        protected int isNativeSubtype(PythonNativeWrapper a, PythonNativeWrapper b) {
+            assert a instanceof PythonClassNativeWrapper || a instanceof PythonClassInitNativeWrapper;
+            assert b instanceof PythonClassNativeWrapper || b instanceof PythonClassInitNativeWrapper;
+            return isSubtypeNode.execute(asPythonObjectNode.execute(a), asPythonObjectNode.execute(b)) ? 1 : 0;
         }
     }