mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 10:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

[3.12] gh-46376: Revert "Return existing pointer when possible in ctypes (GH-107131) (GH-107487)" (#108864)

Browse source 
This reverts commit 54aaaadef8.

Co-authored-by: T. Wouters <thomas@python.org>
This commit is contained in:
Łukasz Langa 2023-09-04 16:24:16 +02:00 • committed by GitHub
parent 7b936ac12e
commit e0f6080819
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Lib/test/test_ctypes/test_keeprefs.py
View file

@ -93,33 +93,6 @@ class PointerTestCase(unittest.TestCase):
x = pointer(i) x = pointer(i)
self.assertEqual(x._objects, {'1': i}) self.assertEqual(x._objects, {'1': i})
def test_pp_ownership(self):
d = c_int(123)
n = c_int(456)
p = pointer(d)
pp = pointer(p)
self.assertIs(pp._objects['1'], p)
self.assertIs(pp._objects['0']['1'], d)
pp.contents.contents = n
self.assertIs(pp._objects['1'], p)
self.assertIs(pp._objects['0']['1'], n)
self.assertIs(p._objects['1'], n)
self.assertEqual(len(p._objects), 1)
del d
del p
self.assertIs(pp._objects['0']['1'], n)
self.assertEqual(len(pp._objects), 2)
del n
self.assertEqual(len(pp._objects), 2)
class PointerToStructure(unittest.TestCase): class PointerToStructure(unittest.TestCase):
def test(self): def test(self):

29
Modules/_ctypes/_ctypes.c
View file

@ -5122,8 +5122,6 @@ static PyObject *
Pointer_get_contents(CDataObject *self, void *closure) Pointer_get_contents(CDataObject *self, void *closure)
{ {
StgDictObject *stgdict; StgDictObject *stgdict;
PyObject *keep, *ptr_probe;
CDataObject *ptr2ptr;
if (*(void **)self->b_ptr == NULL) { if (*(void **)self->b_ptr == NULL) {
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
@ -5133,33 +5131,6 @@ Pointer_get_contents(CDataObject *self, void *closure)
stgdict = PyObject_stgdict((PyObject *)self); stgdict = PyObject_stgdict((PyObject *)self);
assert(stgdict); /* Cannot be NULL for pointer instances */ assert(stgdict); /* Cannot be NULL for pointer instances */
keep = GetKeepedObjects(self);
if (keep != NULL) {
// check if it's a pointer to a pointer:
// pointers will have '0' key in the _objects
ptr_probe = PyDict_GetItemString(keep, "0");
if (ptr_probe != NULL) {
ptr2ptr = (CDataObject*) PyDict_GetItemString(keep, "1");
if (ptr2ptr == NULL) {
PyErr_SetString(PyExc_ValueError,
"Unexpected NULL pointer in _objects");
return NULL;
}
// don't construct a new object,
// return existing one instead to preserve refcount
assert(
*(void**) self->b_ptr == ptr2ptr->b_ptr ||
*(void**) self->b_value.c == ptr2ptr->b_ptr ||
*(void**) self->b_ptr == ptr2ptr->b_value.c ||
*(void**) self->b_value.c == ptr2ptr->b_value.c
); // double-check that we are returning the same thing
Py_INCREF(ptr2ptr);
return (PyObject *) ptr2ptr;
}
}
return PyCData_FromBaseObj(stgdict->proto, return PyCData_FromBaseObj(stgdict->proto,
(PyObject *)self, 0, (PyObject *)self, 0,
*(void **)self->b_ptr); *(void **)self->b_ptr);