Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
1 change: 1 addition & 0 deletions Include/cpython/descrobject.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ typedef struct {
PyDescr_COMMON;
struct wrapperbase *d_base;
void *d_wrapped; /* This can be any function pointer */
vectorcallfunc vectorcall;
} PyWrapperDescrObject;

PyAPI_FUNC(PyObject *) PyDescr_NewWrapper(PyTypeObject *,
Expand Down
19 changes: 19 additions & 0 deletions Lib/test/test_descr.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import builtins
import copyreg
import functools
import gc
import itertools
import math
Expand Down Expand Up @@ -3791,6 +3792,8 @@ def f(a): return a
bytearray.__init__(ba, 'abc\xbd\u20ac',
encoding='latin1', errors='replace')
self.assertEqual(ba, b'abc\xbd?')
with self.assertRaisesRegex(TypeError, 'takes no keyword arguments'):
int.__add__(1, 2, x=1)

@support.skip_if_huge_c_stack()
@support.skip_wasi_stack_overflow()
Expand Down Expand Up @@ -5201,6 +5204,22 @@ class Foo:
self.assertRaises(RecursionError, str, foo)
self.assertRaises(RecursionError, repr, foo)

def test_slot_wrapper_holds_self(self):
# Make sure wrapper takes a strong reference to itself when called.
# cmp_to_key() does not own the objects passed to it. Custom list type
# so we can take a weakref.
class L(list):
pass
class Evil:
def __eq__(evil, other):
k.obj = None
self.assertIsNotNone(wr())
return True
K = functools.cmp_to_key(list.__eq__)
k = K(L([Evil()]))
wr = weakref.ref(k.obj)
k < K([1])

def test_mixing_slot_wrappers(self):
class X(dict):
__setattr__ = dict.__setitem__
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_sys.py
Original file line number Diff line number Diff line change
Expand Up @@ -1772,7 +1772,7 @@ def inner():
import collections
check(collections.defaultdict.default_factory, size('3PP'))
# wrapper_descriptor (descriptor object)
check(int.__add__, size('3P2P'))
check(int.__add__, size('3P3P'))
# method-wrapper (descriptor object)
check({}.__iter__, size('2P'))
# empty dict
Expand Down
55 changes: 44 additions & 11 deletions Objects/descrobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -535,24 +535,22 @@ wrapperdescr_raw_call(PyWrapperDescrObject *descr, PyObject *self,
}

static PyObject *
wrapperdescr_call(PyObject *_descr, PyObject *args, PyObject *kwds)
wrapperdescr_impl(PyObject *_descr, PyObject *const *args,
Py_ssize_t nargs, PyObject *kwds)
{
PyWrapperDescrObject *descr = (PyWrapperDescrObject *)_descr;
Py_ssize_t argc;
PyObject *self, *result;

/* Make sure that the first argument is acceptable as 'self' */
assert(PyTuple_Check(args));
argc = PyTuple_GET_SIZE(args);
if (argc < 1) {
if (nargs < 1) {
PyErr_Format(PyExc_TypeError,
"descriptor '%V' of '%.100s' "
"object needs an argument",
descr_name((PyDescrObject *)descr), "?",
PyDescr_TYPE(descr)->tp_name);
return NULL;
}
self = PyTuple_GET_ITEM(args, 0);
self = args[0];
if (!_PyObject_RealIsSubclass((PyObject *)Py_TYPE(self),
(PyObject *)PyDescr_TYPE(descr))) {
PyErr_Format(PyExc_TypeError,
Expand All @@ -565,12 +563,41 @@ wrapperdescr_call(PyObject *_descr, PyObject *args, PyObject *kwds)
return NULL;
}

args = PyTuple_GetSlice(args, 1, argc);
if (args == NULL) {
PyObject *argstuple = PyTuple_FromArray(args + 1, nargs - 1);
if (argstuple == NULL) {
return NULL;
}
result = wrapperdescr_raw_call(descr, self, args, kwds);
Py_DECREF(args);
/* Turn vectorcall borrowed reference into a strong reference */
Py_INCREF(self);
result = wrapperdescr_raw_call(descr, self, argstuple, kwds);
Py_DECREF(self);
Py_DECREF(argstuple);
return result;
}

static PyObject *
wrapperdescr_call(PyObject *descr, PyObject *args, PyObject *kwds)
{
return wrapperdescr_impl(descr, _PyTuple_ITEMS(args),
PyTuple_GET_SIZE(args), kwds);
}

static PyObject *
wrapperdescr_vectorcall(PyObject *descr, PyObject *const *args,
size_t nargsf, PyObject *kwnames)
{
PyThreadState *tstate = _PyThreadState_GET();
Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
if (kwnames != NULL && PyTuple_GET_SIZE(kwnames) > 0) {
/* These wrappers take no keywords: let tp_call raise */
return _PyObject_MakeTpCall(tstate, descr, args, nargs, kwnames);
}
PyObject *result = NULL;
if (!_Py_EnterRecursiveCallTstate(tstate,
" while calling a Python object")) {
result = wrapperdescr_impl(descr, args, nargs, NULL);
_Py_LeaveRecursiveCallTstate(tstate);
}
return result;
}

Expand Down Expand Up @@ -881,7 +908,7 @@ PyTypeObject PyWrapperDescr_Type = {
sizeof(PyWrapperDescrObject),
0,
descr_dealloc, /* tp_dealloc */
0, /* tp_vectorcall_offset */
offsetof(PyWrapperDescrObject, vectorcall), /* tp_vectorcall_offset */
0, /* tp_getattr */
0, /* tp_setattr */
0, /* tp_as_async */
Expand All @@ -896,6 +923,7 @@ PyTypeObject PyWrapperDescr_Type = {
0, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC |
Py_TPFLAGS_HAVE_VECTORCALL |
Py_TPFLAGS_METHOD_DESCRIPTOR, /* tp_flags */
0, /* tp_doc */
descr_traverse, /* tp_traverse */
Expand Down Expand Up @@ -1030,6 +1058,11 @@ PyDescr_NewWrapper(PyTypeObject *type, struct wrapperbase *base, void *wrapped)
if (descr != NULL) {
descr->d_base = base;
descr->d_wrapped = wrapped;
/* Like METH_VARARGS functions, wrappers taking a keywords dict
(__init__, __call__) are faster through tp_call */
if (!(base->flags & PyWrapperFlag_KEYWORDS)) {
descr->vectorcall = wrapperdescr_vectorcall;
}
}
return (PyObject *)descr;
}
Expand Down
Loading