Don't do upcall in _PyDict_MaybeUntrack

fangerer · qunaibit · commit c3f7493d1d73 · 2024-09-22T17:07:19.000+03:00
diff --git a/graalpython/com.oracle.graal.python.cext/src/dictobject.c b/graalpython/com.oracle.graal.python.cext/src/dictobject.c
@@ -1127,6 +1127,7 @@ _PyDict_HasOnlyStringKeys(PyObject *dict)
 void
 _PyDict_MaybeUntrack(PyObject *op)
 {
+#if 0 // GraalPy change
     PyDictObject *mp;
     PyObject *value;
     Py_ssize_t i, numentries;
@@ -1138,7 +1139,6 @@ _PyDict_MaybeUntrack(PyObject *op)
     if (!GraalPyTruffleDict_MaybeUntrack(op))
         return;
 
-#if 0 // GraalPy change
     mp = (PyDictObject *) op;
     numentries = mp->ma_keys->dk_nentries;
     if (_PyDict_HasSplitTable(mp)) {
@@ -1171,8 +1171,8 @@ _PyDict_MaybeUntrack(PyObject *op)
             }
         }
     }
-#endif // GraalPy change
     _PyObject_GC_UNTRACK(op);
+#endif // GraalPy change
 }
 
 #if 0 // GraalPy change

Original file line number	Diff line number	Diff line change
`@@ -1127,6 +1127,7 @@ _PyDict_HasOnlyStringKeys(PyObject *dict)`
`1127`	`1127`	`void`
`1128`	`1128`	`_PyDict_MaybeUntrack(PyObject *op)`
`1129`	`1129`	`{`
	`1130`	`+#if 0 // GraalPy change`
`1130`	`1131`	`PyDictObject *mp;`
`1131`	`1132`	`PyObject *value;`
`1132`	`1133`	`Py_ssize_t i, numentries;`
`@@ -1138,7 +1139,6 @@ _PyDict_MaybeUntrack(PyObject *op)`
`1138`	`1139`	`if (!GraalPyTruffleDict_MaybeUntrack(op))`
`1139`	`1140`	`return;`
`1140`	`1141`
`1141`		`-#if 0 // GraalPy change`
`1142`	`1142`	`mp = (PyDictObject *) op;`
`1143`	`1143`	`numentries = mp->ma_keys->dk_nentries;`
`1144`	`1144`	`if (_PyDict_HasSplitTable(mp)) {`
`@@ -1171,8 +1171,8 @@ _PyDict_MaybeUntrack(PyObject *op)`
`1171`	`1171`	`}`
`1172`	`1172`	`}`
`1173`	`1173`	`}`
`1174`		`-#endif // GraalPy change`
`1175`	`1174`	`_PyObject_GC_UNTRACK(op);`
	`1175`	`+#endif // GraalPy change`
`1176`	`1176`	`}`
`1177`	`1177`
`1178`	`1178`	`#if 0 // GraalPy change`