Skip to content
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 59 additions & 0 deletions Lib/test/test_stackrefs.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
import unittest
import sys
from test.support import cpython_only
try:
import _testinternalcapi
except ImportError:
_testinternalcapi = None

@cpython_only
class TestDefinition(unittest.TestCase):

def test_equivalence(self):
def run_with_refcount_check(self, func, obj):
refcount = sys.getrefcount(obj)
res = func(obj)
self.assertEqual(sys.getrefcount(obj), refcount)
return res

funcs_with_incref = [
_testinternalcapi.stackref_from_object_new,
_testinternalcapi.stackref_from_object_steal_with_incref,
_testinternalcapi.stackref_make_heap_safe,
_testinternalcapi.stackref_make_heap_safe_with_borrow,
_testinternalcapi.stackref_strong_reference,
]

funcs_with_borrow = [
_testinternalcapi.stackref_from_object_borrow,
_testinternalcapi.stackref_dup_borrowed_with_close,
]

immortal_objs = (None, True, False, 42, '1')

for obj in immortal_objs:
results = set()
for func in funcs_with_incref + funcs_with_borrow:
res = run_with_refcount_check(self, func, obj)
results.add(res)
self.assertEqual(len(results), 1)

mortal_objs = (5000, 3+2j, range(10))

for obj in mortal_objs:
results = set()
for func in funcs_with_incref:
res = run_with_refcount_check(self, func, obj)
results.add(res)
self.assertEqual(len(results), 1)

results = set()
for func in funcs_with_borrow:
res = run_with_refcount_check(self, func, obj)
results.add(res)
self.assertEqual(len(results), 1)



if __name__ == "__main__":
unittest.main()
92 changes: 92 additions & 0 deletions Modules/_testinternalcapi.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include "pycore_pylifecycle.h" // _PyInterpreterConfig_InitFromDict()
#include "pycore_pystate.h" // _PyThreadState_GET()
#include "pycore_runtime_structs.h" // _PY_NSMALLPOSINTS
#include "pycore_stackref.h" // PyStackRef_FunctionCheck()
#include "pycore_unicodeobject.h" // _PyUnicode_TransformDecimalAndSpaceToASCII()

#include "clinic/_testinternalcapi.c.h"
Expand Down Expand Up @@ -2418,6 +2419,90 @@ set_vectorcall_nop(PyObject *self, PyObject *func)
Py_RETURN_NONE;
}

static PyObject *
stackref_to_tuple(_PyStackRef ref, PyObject *op)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I worry that stackref_to_tuple is likely to get out of sync when the stackref implementation changes. Can you move it to Python/stackrefs.c, rename it to _PyStackRef_AsTuple and a declaration to pycore_stackref.h

The other functions below are fine here.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've done this change. But I can see no much value in moving this function to Python/stackrefs.c, so I create 3 different implementations of this little function at pycore_stackref.h.

{
#if !defined(Py_GIL_DISABLED) && defined(Py_STACKREF_DEBUG)
int flags = ref.index & Py_TAG_BITS;
#else
int flags = ref.bits & Py_TAG_BITS;
#endif
return Py_BuildValue("(Ii)", Py_REFCNT(op), flags);
}

static PyObject *
stackref_from_object_new(PyObject *self, PyObject *op)
{
_PyStackRef ref = PyStackRef_FromPyObjectNew(op);
PyObject *obj = stackref_to_tuple(ref, op);
PyStackRef_CLOSE(ref);
return obj;
}

static PyObject *
stackref_from_object_steal_with_incref(PyObject *self, PyObject *op)
{
Py_INCREF(op);
_PyStackRef ref = PyStackRef_FromPyObjectSteal(op);
PyObject *obj = stackref_to_tuple(ref, op);
PyObject *op2 = PyStackRef_AsPyObjectSteal(ref);
Py_DECREF(op2);
return obj;
}

static PyObject *
stackref_make_heap_safe(PyObject *self, PyObject *op)
{
_PyStackRef ref = PyStackRef_FromPyObjectNew(op);
_PyStackRef ref2 = PyStackRef_MakeHeapSafe(ref);
PyObject *obj = stackref_to_tuple(ref2, op);
PyStackRef_CLOSE(ref2);
return obj;
}

static PyObject *
stackref_make_heap_safe_with_borrow(PyObject *self, PyObject *op)
{
_PyStackRef ref = PyStackRef_FromPyObjectNew(op);
_PyStackRef ref2 = PyStackRef_Borrow(ref);
_PyStackRef ref3 = PyStackRef_MakeHeapSafe(ref2);
PyStackRef_CLOSE(ref);
PyObject *obj = stackref_to_tuple(ref3, op);
PyStackRef_CLOSE(ref3);
return obj;
}

static PyObject *
stackref_strong_reference(PyObject *self, PyObject *op)
{
_PyStackRef ref = PyStackRef_FromPyObjectBorrow(op);
PyObject *op2 = PyStackRef_AsPyObjectSteal(ref);
_PyStackRef ref2 = PyStackRef_FromPyObjectSteal(op2);
PyObject *obj = stackref_to_tuple(ref2, op);
PyStackRef_CLOSE(ref2);
return obj;
}

static PyObject *
stackref_from_object_borrow(PyObject *self, PyObject *op)
{
_PyStackRef ref = PyStackRef_FromPyObjectBorrow(op);
PyObject *obj = stackref_to_tuple(ref, op);
PyStackRef_CLOSE(ref);
return obj;
}

static PyObject *
stackref_dup_borrowed_with_close(PyObject *self, PyObject *op)
{
_PyStackRef ref = PyStackRef_FromPyObjectBorrow(op);
_PyStackRef ref2 = PyStackRef_DUP(ref);
PyStackRef_XCLOSE(ref);
PyObject *obj = stackref_to_tuple(ref2, op);
PyStackRef_XCLOSE(ref2);
return obj;
}

static PyMethodDef module_functions[] = {
{"get_configs", get_configs, METH_NOARGS},
{"get_recursion_depth", get_recursion_depth, METH_NOARGS},
Expand Down Expand Up @@ -2527,6 +2612,13 @@ static PyMethodDef module_functions[] = {
#endif
{"simple_pending_call", simple_pending_call, METH_O},
{"set_vectorcall_nop", set_vectorcall_nop, METH_O},
{"stackref_from_object_new", stackref_from_object_new, METH_O},
{"stackref_from_object_steal_with_incref", stackref_from_object_steal_with_incref, METH_O},
{"stackref_make_heap_safe", stackref_make_heap_safe, METH_O},
{"stackref_make_heap_safe_with_borrow", stackref_make_heap_safe_with_borrow, METH_O},
{"stackref_strong_reference", stackref_strong_reference, METH_O},
{"stackref_from_object_borrow", stackref_from_object_borrow, METH_O},
{"stackref_dup_borrowed_with_close", stackref_dup_borrowed_with_close, METH_O},
{NULL, NULL} /* sentinel */
};

Expand Down
Loading