[GR-50455] Avoid unnecessary upcalls for PyObject_GC_Un-/Track.

PullRequest: graalpython/3086

Author: fangerer

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

@@ -2216,14 +2216,6 @@ PyAPI_FUNC(int) PyObject_GC_IsFinalized(PyObject* a) {
 PyAPI_FUNC(int) PyObject_GC_IsTracked(PyObject* a) {
     FUNC_NOT_IMPLEMENTED
 }
-#undef PyObject_GC_Track
-PyAPI_FUNC(void) PyObject_GC_Track(void* a) {
-    GraalPyObject_GC_Track(a);
-}
-#undef PyObject_GC_UnTrack
-PyAPI_FUNC(void) PyObject_GC_UnTrack(void* a) {
-    GraalPyObject_GC_UnTrack(a);
-}
 #undef PyObject_GET_WEAKREFS_LISTPTR
 PyAPI_FUNC(PyObject**) PyObject_GET_WEAKREFS_LISTPTR(PyObject* a) {
     FUNC_NOT_IMPLEMENTED

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

@@ -239,8 +239,6 @@ typedef struct {
     BUILTIN(PyObject_DelItem, int, PyObject*, PyObject*) \
     BUILTIN(PyObject_Dir, PyObject*, PyObject*) \
     BUILTIN(PyObject_Format, PyObject*, PyObject*, PyObject*) \
-    BUILTIN(PyObject_GC_Track, void, void*) \
-    BUILTIN(PyObject_GC_UnTrack, void, void*) \
     BUILTIN(PyObject_GetDoc, const char*, PyObject*) \
     BUILTIN(PyObject_GetItem, PyObject*, PyObject*, PyObject*) \
     BUILTIN(PyObject_GetIter, PyObject*, PyObject*) \
@@ -335,6 +333,8 @@ typedef struct {
     BUILTIN(PyTruffleNumber_UnaryOp, PyObject*, PyObject*, int) \
     BUILTIN(PyTruffleObject_CallFunctionObjArgs, PyObject*, PyObject*, va_list*) \
     BUILTIN(PyTruffleObject_CallMethodObjArgs, PyObject*, PyObject*, PyObject*, va_list*) \
+    BUILTIN(PyTruffleObject_GC_Track, void, void*) \
+    BUILTIN(PyTruffleObject_GC_UnTrack, void, void*) \
     BUILTIN(PyTruffleObject_GenericGetAttr, PyObject*, PyObject*, PyObject*) \
     BUILTIN(PyTruffleObject_GenericSetAttr, int, PyObject*, PyObject*, PyObject*) \
     BUILTIN(PyTruffleObject_GetItemString, PyObject*, PyObject*, const char*) \

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

@@ -1075,5 +1075,17 @@ PyVarObject* _PyObject_GC_NewVar(PyTypeObject *tp, Py_ssize_t nitems) {
 }
 
 void PyObject_GC_Del(void *tp) {
-	PyObject_Free(tp);
+    PyObject_Free(tp);
+}
+
+void PyObject_GC_Track(void* a) {
+    if (PyTruffle_Trace_Memory()) {
+        GraalPyTruffleObject_GC_Track(a);
+    }
+}
+
+void PyObject_GC_UnTrack(void* a) {
+    if (PyTruffle_Trace_Memory()) {
+        GraalPyTruffleObject_GC_UnTrack(a);
+    }
 }

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

@@ -1476,9 +1476,9 @@ protected void trace(PythonContext context, Object ptr, Reference ref, TruffleSt
         }
     }
 
-    @CApiBuiltin(ret = Void, args = {Pointer}, call = Direct)
-    abstract static class PyObject_GC_UnTrack extends PyTruffleGcTracingNode {
-        private static final TruffleLogger LOGGER = CApiContext.getLogger(PyObject_GC_UnTrack.class);
+    @CApiBuiltin(ret = Void, args = {Pointer}, call = Ignored)
+    abstract static class PyTruffleObject_GC_UnTrack extends PyTruffleGcTracingNode {
+        private static final TruffleLogger LOGGER = CApiContext.getLogger(PyTruffleObject_GC_UnTrack.class);
 
         @Override
         protected void trace(PythonContext context, Object ptr, Reference ref, TruffleString className) {
@@ -1487,9 +1487,9 @@ protected void trace(PythonContext context, Object ptr, Reference ref, TruffleSt
         }
     }
 
-    @CApiBuiltin(ret = Void, args = {Pointer}, call = Direct)
-    abstract static class PyObject_GC_Track extends PyTruffleGcTracingNode {
-        private static final TruffleLogger LOGGER = CApiContext.getLogger(PyObject_GC_Track.class);
+    @CApiBuiltin(ret = Void, args = {Pointer}, call = Ignored)
+    abstract static class PyTruffleObject_GC_Track extends PyTruffleGcTracingNode {
+        private static final TruffleLogger LOGGER = CApiContext.getLogger(PyTruffleObject_GC_Track.class);
 
         @Override
         protected void trace(PythonContext context, Object ptr, Reference ref, TruffleString className) {

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

@@ -537,6 +537,8 @@ public final class CApiFunction {
     @CApiBuiltin(name = "PyModule_GetState", ret = Pointer, args = {PyObject}, call = CImpl)
     @CApiBuiltin(name = "PyModuleDef_Init", ret = PyObject, args = {PYMODULEDEF_PTR}, call = CImpl)
     @CApiBuiltin(name = "PyObject_SelfIter", ret = PyObject, args = {PyObject}, call = CImpl)
+    @CApiBuiltin(name = "PyObject_GC_Track", ret = Void, args = {Pointer}, call = CImpl)
+    @CApiBuiltin(name = "PyObject_GC_UnTrack", ret = Void, args = {Pointer}, call = CImpl)
     @CApiBuiltin(name = "PyMethodDescrObject_GetMethod", ret = PyMethodDef, args = {PyObject}, call = CImpl)
     @CApiBuiltin(name = "PyDescr_NewClassMethod", ret = PyObject, args = {PyTypeObject, PyMethodDef}, call = CImpl)
     @CApiBuiltin(name = "PyDescr_NewGetSet", ret = PyObject, args = {PyTypeObject, PyGetSetDef}, call = CImpl)

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

@@ -1082,13 +1082,15 @@ def test_alive(self):
         self.assertIs(r().__func__, o.some_method.__func__)
         self.assertEqual(r()(), 4)
 
+    @support.impl_detail("weakref nondeterministic", graalpy=False)
     def test_object_dead(self):
         o = Object(1)
         r = weakref.WeakMethod(o.some_method)
         del o
         gc.collect()
         self.assertIs(r(), None)
 
+    @support.impl_detail("weakref nondeterministic", graalpy=False)
     def test_method_dead(self):
         C = self._subclass()
         o = C(1)
@@ -1114,6 +1116,7 @@ def cb(arg):
         gc.collect()
         self.assertEqual(calls, [r])
 
+    @support.impl_detail("weakref nondeterministic", graalpy=False)
     def test_callback_when_method_dead(self):
         # Test callback behaviour when method dies first.
         C = self._subclass()