[GR-47946] Fix for pandas regression

PullRequest: graalpython/2914

Author: msimacek

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

@@ -849,6 +849,22 @@ PyAPI_FUNC(void) initialize_graal_capi(TruffleEnv* env, void* (*getBuiltin)(int
     PyTruffle_Log(PY_TRUFFLE_LOG_FINE, "initialize_graal_capi: %fs", ((double) (clock() - t)) / CLOCKS_PER_SEC);
 }
 
+/*
+This is a workaround for C++ modules, namely PyTorch, that declare global/static variables with destructors that call
+_Py_DECREF. The destructors get called by libc during exit during which we cannot make upcalls as that would segfault.
+So we rebind them to no-ops when exiting.
+*/
+Py_ssize_t nop_GraalPy_get_PyObject_ob_refcnt(PyObject* obj) {
+ return 100; // large dummy refcount
+}
+void nop_GraalPy_set_PyObject_ob_refcnt(PyObject* obj, Py_ssize_t refcnt) {
+ // do nothing
+}
+PyAPI_FUNC(void) finalizeCAPI() {
+ GraalPy_get_PyObject_ob_refcnt = nop_GraalPy_get_PyObject_ob_refcnt;
+ GraalPy_set_PyObject_ob_refcnt = nop_GraalPy_set_PyObject_ob_refcnt;
+}
+
 static void unimplemented(const char* name) {
 	printf("Function not implemented in GraalPy: %s\n", name);
 }

graalpython/com.oracle.graal.python.test/src/tests/cpyext/__init__.py

@@ -48,6 +48,7 @@
 
 GRAALPYTHON = sys.implementation.name == "graalpy"
 
+IS_MANAGED_LAUNCHER = not GRAALPYTHON or __graalpython__.is_managed_launcher()
 
 def assert_raises(err, fn, *args, **kwargs):
     raised = False
@@ -494,7 +495,7 @@ def get_value(self, key, args, kwds):
             return Formatter.get_value(key, args, kwds)
 
 
-def CPyExtType(name, code, **kwargs):
+def CPyExtType(name, code='', **kwargs):
     template = """
     #include "Python.h"
     /* structmember.h is not included by default in Python.h */

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_datetime.py

@@ -38,11 +38,50 @@
 # SOFTWARE.
 import datetime
 
-from . import CPyExtType, CPyExtTestCase, CPyExtFunction, unhandled_error_compare
+from . import CPyExtType, CPyExtTestCase, CPyExtFunction, unhandled_error_compare, is_native_object, IS_MANAGED_LAUNCHER
 
 __dir__ = __file__.rpartition("/")[0]
 
 
+def create_datetime_subclass(typename):
+    return CPyExtType(
+        f"Native{typename}Subclass",
+        struct_base=f'PyDateTime_{typename} base;',
+        tp_new='0',
+        tp_alloc='0',
+        tp_free='0',
+        includes='#include "datetime.h"',
+        ready_code=f'''
+        PyDateTime_IMPORT;
+        PyTypeObject* t = PyDateTimeAPI->{typename}Type;
+        Py_XINCREF(t);
+        Native{typename}SubclassType.tp_base = t;
+        ''',
+    )
+
+
+NativeDateSubclass = create_datetime_subclass("Date")
+NativeTimeSubclass = create_datetime_subclass("Time")
+NativeDateTimeSubclass = create_datetime_subclass("DateTime")
+NativeDeltaSubclass = create_datetime_subclass("Delta")
+
+
+class ManagedNativeDateSubclass(NativeDateSubclass):
+    pass
+
+
+class ManagedNativeTimeSubclass(NativeTimeSubclass):
+    pass
+
+
+class ManagedNativeDateTimeSubclass(NativeDateTimeSubclass):
+    pass
+
+
+class ManagedNativeDeltaSubclass(NativeDeltaSubclass):
+    pass
+
+
 class TestPyDateTime(CPyExtTestCase):
 
     def compile_module(self, name):
@@ -577,3 +616,32 @@ def test_write_and_invoke_member(self):
         )
         tester = TestWriteAndInvokeMemeber()
         assert tester.getDate() == "foo"
+
+
+# GR-47546: Native subclasses of managed types don't work in managed mode
+if not IS_MANAGED_LAUNCHER:
+    class TestNativeSubclasses:
+        def test_time(self):
+            for t in (NativeTimeSubclass, ManagedNativeTimeSubclass):
+                x = t(hour=6)
+                assert is_native_object(x)
+                assert x.hour == 6
+
+        def test_date(self):
+            for t in (NativeDateSubclass, ManagedNativeDateSubclass):
+                x = t(1992, 4, 11)
+                assert is_native_object(x)
+                assert x.day == 11
+
+        def test_datetime(self):
+            for t in (NativeDateTimeSubclass, ManagedNativeDateTimeSubclass):
+                x = t(1992, 4, 11, hour=13)
+                assert is_native_object(x)
+                assert x.day == 11
+                assert x.hour == 13
+
+        def test_timedelta(self):
+            for t in (NativeDeltaSubclass, ManagedNativeDeltaSubclass):
+                x = t(hours=6)
+                assert is_native_object(x)
+                assert x.seconds == 21600

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextBuiltins.java

@@ -1122,8 +1122,8 @@ static Object addInheritedSlots(PythonAbstractNativeObject pythonClass,
                         int flags = readI32.readStructArrayElement(member, i, PyMemberDef__flags);
                         Object docPtr = readPointer.readStructArrayElement(member, i, PyMemberDef__doc);
                         Object doc = PGuards.isNullOrZero(docPtr, lib) ? PNone.NO_VALUE : fromCharPointer.execute(docPtr);
-
-                        addMember.execute(pythonClass, dict, name, type, offset, flags & CConstants.READONLY.intValue(), doc);
+                        boolean canSet = (flags & CConstants.READONLY.intValue()) == 0;
+                        addMember.execute(pythonClass, dict, name, type, offset, canSet ? 1 : 0, doc);
                     }
                 }
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CApiContext.java

@@ -187,7 +187,6 @@ private record ClosureInfo(Object closure, Object delegate, Object executable, l
      */
     private final HashMap<Object, ClosureInfo> callableClosureByExecutable = new HashMap<>();
     private final HashMap<Long, ClosureInfo> callableClosures = new HashMap<>();
-    private Object nativeLibrary;
 
     /**
      * This list holds a strong reference to all loaded extension libraries to keep the library
@@ -591,11 +590,11 @@ public static CApiContext ensureCapiWasLoaded(Node node, PythonContext context,
 
     @TruffleBoundary
     public void finalizeCapi() {
-        if (nativeLibrary != null) {
+        if (useNativeBackend && getLLVMLibrary() != null) {
             try {
-                Object initFunction = InteropLibrary.getUncached().readMember(nativeLibrary, "finalizeCAPI");
+                Object finalizeFunction = InteropLibrary.getUncached().readMember(getLLVMLibrary(), "finalizeCAPI");
                 Object signature = PythonContext.get(null).getEnv().parseInternal(Source.newBuilder(J_NFI_LANGUAGE, "():VOID", "exec").build()).call();
-                SignatureLibrary.getUncached().call(signature, initFunction);
+                SignatureLibrary.getUncached().call(signature, finalizeFunction);
             } catch (InteropException e) {
                 throw CompilerDirectives.shouldNotReachHere(e);
             }