guard refcnt for nogil python

jpype-project · Nov 18, 2024 · 7c31d02 · Thrameos · Nov 18, 2024 · astrelsky
1 parent 50fa58d
commit 7c31d02
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/native/common/jp_tracer.cpp b/native/common/jp_tracer.cpp
@@ -150,7 +150,13 @@ void JPypeTracer::tracePythonObject(const char* msg, PyObject* ref)
 	if (ref != nullptr)
 	{
 		std::stringstream str;
-		str << msg << " " << (void*) ref << " " << Py_REFCNT(ref) << " " << Py_TYPE(ref)->tp_name;
+		str << msg << " " << (void*) ref << " "<<
+    #ifndef Py_GIL_DISABLED
+        Py_REFCNT(ref)
+    #else
+        -1
+    #endif
+        << " " << Py_TYPE(ref)->tp_name;
 		JPypeTracer::trace1("PY", str.str().c_str());
 
 	} else

diff --git a/native/python/jp_pythontypes.cpp b/native/python/jp_pythontypes.cpp
@@ -22,6 +22,7 @@
 
 static void assertValid(PyObject *obj)
 {
+#ifndef Py_GIL_DISABLED
 	if (Py_REFCNT(obj) >= 1)
 		return;
 
@@ -34,6 +35,9 @@ static void assertValid(PyObject *obj)
 	JP_TRACE_PY("pyref FAULT", obj);
 	JP_RAISE(PyExc_SystemError, "Deleted reference");
 	// GCOVR_EXCL_STOP
+#else
+    return; // GIL is disabled; we assume obj is valid
+#endif
 }
 
 /**