Avoid unnecessary upcalls for PyObject_GC_Un-/Track

Author: fangerer

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

@@ -2207,14 +2207,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

@@ -234,8 +234,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*) \
@@ -330,6 +328,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

@@ -987,5 +987,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);
+    }
 }