Correctly implement registering of native subclasses.

Author: fangerer

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

@@ -163,12 +163,24 @@ Py_ssize_t PyObject_Size(PyObject *o) {
 }
 
 static int add_subclass(PyTypeObject *base, PyTypeObject *type) {
-	PyObject* result = UPCALL_CEXT_O("PyTruffle_Add_Subclass", native_to_java(base->tp_subclasses), native_to_java(PyLong_FromVoidPtr(type)), native_to_java((PyObject*)type));
-	if (result == NULL) {
-		return -1;
-	}
-	base->tp_subclasses = result;
-	return 0;
+    void* key = PyLong_FromVoidPtr((void *) type);
+    if (key == NULL) {
+        return -1;
+    }
+    if (polyglot_is_value(base)) {
+        return polyglot_as_i32(polyglot_invoke(PY_TRUFFLE_CEXT, "PyTruffle_Add_Subclass", native_to_java(base), native_to_java(key), native_to_java(type)));
+    } else {
+        PyObject *dict = base->tp_subclasses;
+        if (dict == NULL) {
+            base->tp_subclasses = dict = PyDict_New();
+            if (dict == NULL) {
+                return -1;
+            }
+        }
+        // TODO value should be a weak reference !
+        return PyDict_SetItem(base->tp_subclasses, key, type);
+    }
+	return -1;
 }
 
 /* Special C landing functions that convert some arguments to primitives. */

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

@@ -38,6 +38,8 @@
  */
 package com.oracle.graal.python.builtins.modules;
 
+import static com.oracle.graal.python.runtime.exception.PythonErrorType.SystemError;
+
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.CharacterCodingException;
@@ -1206,4 +1208,25 @@ Object get() {
             return getContext().getCustomThreadState();
         }
     }
+
+    @Builtin(name = "PyTruffle_Add_Subclass", fixedNumOfArguments = 3)
+    @GenerateNodeFactory
+    abstract static class PyTruffle_Add_Subclass extends NativeBuiltin {
+
+        @Specialization
+        int doManagedSubclass(PythonClassNativeWrapper base, @SuppressWarnings("unused") Object key, PythonClassNativeWrapper value) {
+            addToSet((PythonClass) base.getPythonObject(), (PythonClass) value.getPythonObject());
+            return 0;
+        }
+
+        @Fallback
+        int doGeneric(@SuppressWarnings("unused") Object base, @SuppressWarnings("unused") Object key, @SuppressWarnings("unused") Object value) {
+            return raiseNative(-1, SystemError, "Builtin can only handle managed base class.");
+        }
+
+        @TruffleBoundary
+        private static void addToSet(PythonClass base, PythonClass value) {
+            base.getSubClasses().add(value);
+        }
+    }
 }

graalpython/lib-graalpython/python_cext.py

@@ -738,14 +738,6 @@ def PyType_IsSubtype(a, b):
     return 1 if b in a.mro() else 0
 
 
-@may_raise
-def PyTruffle_Add_Subclass(bases_dict, key, cls):
-    if not bases_dict:
-        bases_dict = dict()
-    bases_dict[key] = cls
-    return bases_dict
-
-
 def PyTuple_New(size):
     return (None,) * size