bpo-37499: Test various C calling conventions (GH-15776)
Add functions with various calling conventions to `_testcapi`, expose them as module-level functions, bound methods, class methods, and static methods, and test calling them and introspecting them through GDB. https://bugs.python.org/issue37499 Co-authored-by: Jeroen Demeyer <J.Demeyer@UGent.be> Automerge-Triggered-By: @pganssle
This commit is contained in:
Petr Viktorin
Miss Islington (bot)
parent
f1a297acb6
commit
f958377b67
|
|
@ -27,125 +27,6 @@ class FunctionCalls(unittest.TestCase):
|
|||
self.assertEqual(list(res.items()), expected)
|
||||
|
||||
|
||||
# The test cases here cover several paths through the function calling
|
||||
# code. They depend on the METH_XXX flag that is used to define a C
|
||||
# function, which can't be verified from Python. If the METH_XXX decl
|
||||
# for a C function changes, these tests may not cover the right paths.
|
||||
|
||||
class CFunctionCalls(unittest.TestCase):
|
||||
|
||||
def test_varargs0(self):
|
||||
self.assertRaises(TypeError, {}.__contains__)
|
||||
|
||||
def test_varargs1(self):
|
||||
{}.__contains__(0)
|
||||
|
||||
def test_varargs2(self):
|
||||
self.assertRaises(TypeError, {}.__contains__, 0, 1)
|
||||
|
||||
def test_varargs0_ext(self):
|
||||
try:
|
||||
{}.__contains__(*())
|
||||
except TypeError:
|
||||
pass
|
||||
|
||||
def test_varargs1_ext(self):
|
||||
{}.__contains__(*(0,))
|
||||
|
||||
def test_varargs2_ext(self):
|
||||
try:
|
||||
{}.__contains__(*(1, 2))
|
||||
except TypeError:
|
||||
pass
|
||||
else:
|
||||
raise RuntimeError
|
||||
|
||||
def test_varargs1_kw(self):
|
||||
self.assertRaises(TypeError, {}.__contains__, x=2)
|
||||
|
||||
def test_varargs2_kw(self):
|
||||
self.assertRaises(TypeError, {}.__contains__, x=2, y=2)
|
||||
|
||||
def test_oldargs0_0(self):
|
||||
{}.keys()
|
||||
|
||||
def test_oldargs0_1(self):
|
||||
self.assertRaises(TypeError, {}.keys, 0)
|
||||
|
||||
def test_oldargs0_2(self):
|
||||
self.assertRaises(TypeError, {}.keys, 0, 1)
|
||||
|
||||
def test_oldargs0_0_ext(self):
|
||||
{}.keys(*())
|
||||
|
||||
def test_oldargs0_1_ext(self):
|
||||
try:
|
||||
{}.keys(*(0,))
|
||||
except TypeError:
|
||||
pass
|
||||
else:
|
||||
raise RuntimeError
|
||||
|
||||
def test_oldargs0_2_ext(self):
|
||||
try:
|
||||
{}.keys(*(1, 2))
|
||||
except TypeError:
|
||||
pass
|
||||
else:
|
||||
raise RuntimeError
|
||||
|
||||
def test_oldargs0_0_kw(self):
|
||||
try:
|
||||
{}.keys(x=2)
|
||||
except TypeError:
|
||||
pass
|
||||
else:
|
||||
raise RuntimeError
|
||||
|
||||
def test_oldargs0_1_kw(self):
|
||||
self.assertRaises(TypeError, {}.keys, x=2)
|
||||
|
||||
def test_oldargs0_2_kw(self):
|
||||
self.assertRaises(TypeError, {}.keys, x=2, y=2)
|
||||
|
||||
def test_oldargs1_0(self):
|
||||
self.assertRaises(TypeError, [].count)
|
||||
|
||||
def test_oldargs1_1(self):
|
||||
[].count(1)
|
||||
|
||||
def test_oldargs1_2(self):
|
||||
self.assertRaises(TypeError, [].count, 1, 2)
|
||||
|
||||
def test_oldargs1_0_ext(self):
|
||||
try:
|
||||
[].count(*())
|
||||
except TypeError:
|
||||
pass
|
||||
else:
|
||||
raise RuntimeError
|
||||
|
||||
def test_oldargs1_1_ext(self):
|
||||
[].count(*(1,))
|
||||
|
||||
def test_oldargs1_2_ext(self):
|
||||
try:
|
||||
[].count(*(1, 2))
|
||||
except TypeError:
|
||||
pass
|
||||
else:
|
||||
raise RuntimeError
|
||||
|
||||
def test_oldargs1_0_kw(self):
|
||||
self.assertRaises(TypeError, [].count, x=2)
|
||||
|
||||
def test_oldargs1_1_kw(self):
|
||||
self.assertRaises(TypeError, [].count, {}, x=2)
|
||||
|
||||
def test_oldargs1_2_kw(self):
|
||||
self.assertRaises(TypeError, [].count, x=2, y=2)
|
||||
|
||||
|
||||
@cpython_only
|
||||
class CFunctionCallsErrorMessages(unittest.TestCase):
|
||||
|
||||
|
|
@ -289,6 +170,176 @@ class CFunctionCallsErrorMessages(unittest.TestCase):
|
|||
self.assertRaisesRegex(TypeError, msg, [].count, x=2, y=2)
|
||||
|
||||
|
||||
|
||||
class TestCallingConventions(unittest.TestCase):
|
||||
"""Test calling using various C calling conventions (METH_*) from Python
|
||||
|
||||
Subclasses test several kinds of functions (module-level, methods,
|
||||
class methods static methods) using these attributes:
|
||||
obj: the object that contains tested functions (as attributes)
|
||||
expected_self: expected "self" argument to the C function
|
||||
|
||||
The base class tests module-level functions.
|
||||
"""
|
||||
|
||||
def setUp(self):
|
||||
self.obj = self.expected_self = _testcapi
|
||||
|
||||
def test_varargs(self):
|
||||
self.assertEqual(
|
||||
self.obj.meth_varargs(1, 2, 3),
|
||||
(self.expected_self, (1, 2, 3)),
|
||||
)
|
||||
|
||||
def test_varargs_ext(self):
|
||||
self.assertEqual(
|
||||
self.obj.meth_varargs(*(1, 2, 3)),
|
||||
(self.expected_self, (1, 2, 3)),
|
||||
)
|
||||
|
||||
def test_varargs_error_kw(self):
|
||||
msg = r"meth_varargs\(\) takes no keyword arguments"
|
||||
self.assertRaisesRegex(
|
||||
TypeError, msg, lambda: self.obj.meth_varargs(k=1),
|
||||
)
|
||||
|
||||
def test_varargs_keywords(self):
|
||||
self.assertEqual(
|
||||
self.obj.meth_varargs_keywords(1, 2, a=3, b=4),
|
||||
(self.expected_self, (1, 2), {'a': 3, 'b': 4})
|
||||
)
|
||||
|
||||
def test_varargs_keywords_ext(self):
|
||||
self.assertEqual(
|
||||
self.obj.meth_varargs_keywords(*[1, 2], **{'a': 3, 'b': 4}),
|
||||
(self.expected_self, (1, 2), {'a': 3, 'b': 4})
|
||||
)
|
||||
|
||||
def test_o(self):
|
||||
self.assertEqual(self.obj.meth_o(1), (self.expected_self, 1))
|
||||
|
||||
def test_o_ext(self):
|
||||
self.assertEqual(self.obj.meth_o(*[1]), (self.expected_self, 1))
|
||||
|
||||
def test_o_error_no_arg(self):
|
||||
msg = r"meth_o\(\) takes exactly one argument \(0 given\)"
|
||||
self.assertRaisesRegex(TypeError, msg, self.obj.meth_o)
|
||||
|
||||
def test_o_error_two_args(self):
|
||||
msg = r"meth_o\(\) takes exactly one argument \(2 given\)"
|
||||
self.assertRaisesRegex(
|
||||
TypeError, msg, lambda: self.obj.meth_o(1, 2),
|
||||
)
|
||||
|
||||
def test_o_error_ext(self):
|
||||
msg = r"meth_o\(\) takes exactly one argument \(3 given\)"
|
||||
self.assertRaisesRegex(
|
||||
TypeError, msg, lambda: self.obj.meth_o(*(1, 2, 3)),
|
||||
)
|
||||
|
||||
def test_o_error_kw(self):
|
||||
msg = r"meth_o\(\) takes no keyword arguments"
|
||||
self.assertRaisesRegex(
|
||||
TypeError, msg, lambda: self.obj.meth_o(k=1),
|
||||
)
|
||||
|
||||
def test_o_error_arg_kw(self):
|
||||
msg = r"meth_o\(\) takes no keyword arguments"
|
||||
self.assertRaisesRegex(
|
||||
TypeError, msg, lambda: self.obj.meth_o(k=1),
|
||||
)
|
||||
|
||||
def test_noargs(self):
|
||||
self.assertEqual(self.obj.meth_noargs(), self.expected_self)
|
||||
|
||||
def test_noargs_ext(self):
|
||||
self.assertEqual(self.obj.meth_noargs(*[]), self.expected_self)
|
||||
|
||||
def test_noargs_error_arg(self):
|
||||
msg = r"meth_noargs\(\) takes no arguments \(1 given\)"
|
||||
self.assertRaisesRegex(
|
||||
TypeError, msg, lambda: self.obj.meth_noargs(1),
|
||||
)
|
||||
|
||||
def test_noargs_error_arg2(self):
|
||||
msg = r"meth_noargs\(\) takes no arguments \(2 given\)"
|
||||
self.assertRaisesRegex(
|
||||
TypeError, msg, lambda: self.obj.meth_noargs(1, 2),
|
||||
)
|
||||
|
||||
def test_noargs_error_ext(self):
|
||||
msg = r"meth_noargs\(\) takes no arguments \(3 given\)"
|
||||
self.assertRaisesRegex(
|
||||
TypeError, msg, lambda: self.obj.meth_noargs(*(1, 2, 3)),
|
||||
)
|
||||
|
||||
def test_noargs_error_kw(self):
|
||||
msg = r"meth_noargs\(\) takes no keyword arguments"
|
||||
self.assertRaisesRegex(
|
||||
TypeError, msg, lambda: self.obj.meth_noargs(k=1),
|
||||
)
|
||||
|
||||
def test_fastcall(self):
|
||||
self.assertEqual(
|
||||
self.obj.meth_fastcall(1, 2, 3),
|
||||
(self.expected_self, (1, 2, 3)),
|
||||
)
|
||||
|
||||
def test_fastcall_ext(self):
|
||||
self.assertEqual(
|
||||
self.obj.meth_fastcall(*(1, 2, 3)),
|
||||
(self.expected_self, (1, 2, 3)),
|
||||
)
|
||||
|
||||
def test_fastcall_error_kw(self):
|
||||
msg = r"meth_fastcall\(\) takes no keyword arguments"
|
||||
self.assertRaisesRegex(
|
||||
TypeError, msg, lambda: self.obj.meth_fastcall(k=1),
|
||||
)
|
||||
|
||||
def test_fastcall_keywords(self):
|
||||
self.assertEqual(
|
||||
self.obj.meth_fastcall_keywords(1, 2, a=3, b=4),
|
||||
(self.expected_self, (1, 2), {'a': 3, 'b': 4})
|
||||
)
|
||||
|
||||
def test_fastcall_keywords_ext(self):
|
||||
self.assertEqual(
|
||||
self.obj.meth_fastcall_keywords(*(1, 2), **{'a': 3, 'b': 4}),
|
||||
(self.expected_self, (1, 2), {'a': 3, 'b': 4})
|
||||
)
|
||||
|
||||
|
||||
class TestCallingConventionsInstance(TestCallingConventions):
|
||||
"""Test calling instance methods using various calling conventions"""
|
||||
|
||||
def setUp(self):
|
||||
self.obj = self.expected_self = _testcapi.MethInstance()
|
||||
|
||||
|
||||
class TestCallingConventionsClass(TestCallingConventions):
|
||||
"""Test calling class methods using various calling conventions"""
|
||||
|
||||
def setUp(self):
|
||||
self.obj = self.expected_self = _testcapi.MethClass
|
||||
|
||||
|
||||
class TestCallingConventionsClassInstance(TestCallingConventions):
|
||||
"""Test calling class methods on instance"""
|
||||
|
||||
def setUp(self):
|
||||
self.obj = _testcapi.MethClass()
|
||||
self.expected_self = _testcapi.MethClass
|
||||
|
||||
|
||||
class TestCallingConventionsStatic(TestCallingConventions):
|
||||
"""Test calling static methods using various calling conventions"""
|
||||
|
||||
def setUp(self):
|
||||
self.obj = _testcapi.MethStatic()
|
||||
self.expected_self = None
|
||||
|
||||
|
||||
def pyfunc(arg1, arg2):
|
||||
return [arg1, arg2]
|
||||
|
||||
|
|
@ -315,14 +366,14 @@ class PythonClass:
|
|||
|
||||
PYTHON_INSTANCE = PythonClass()
|
||||
|
||||
NULL_OR_EMPTY = object()
|
||||
|
||||
IGNORE_RESULT = object()
|
||||
|
||||
|
||||
@cpython_only
|
||||
class FastCallTests(unittest.TestCase):
|
||||
"""Test calling using various callables from C
|
||||
"""
|
||||
|
||||
# Test calls with positional arguments
|
||||
CALLS_POSARGS = (
|
||||
CALLS_POSARGS = [
|
||||
# (func, args: tuple, result)
|
||||
|
||||
# Python function with 2 arguments
|
||||
|
|
@ -341,31 +392,11 @@ class FastCallTests(unittest.TestCase):
|
|||
(PYTHON_INSTANCE.class_method, (), "classmethod"),
|
||||
(PYTHON_INSTANCE.static_method, (), "staticmethod"),
|
||||
|
||||
# C function: METH_NOARGS
|
||||
(globals, (), IGNORE_RESULT),
|
||||
|
||||
# C function: METH_O
|
||||
(id, ("hello",), IGNORE_RESULT),
|
||||
|
||||
# C function: METH_VARARGS
|
||||
(dir, (1,), IGNORE_RESULT),
|
||||
|
||||
# C function: METH_VARARGS | METH_KEYWORDS
|
||||
(min, (5, 9), 5),
|
||||
|
||||
# C function: METH_FASTCALL
|
||||
(divmod, (1000, 33), (30, 10)),
|
||||
|
||||
# C type static method: METH_FASTCALL | METH_CLASS
|
||||
(int.from_bytes, (b'\x01\x00', 'little'), 1),
|
||||
|
||||
# bpo-30524: Test that calling a C type static method with no argument
|
||||
# doesn't crash (ignore the result): METH_FASTCALL | METH_CLASS
|
||||
(datetime.datetime.now, (), IGNORE_RESULT),
|
||||
)
|
||||
# C callables are added later
|
||||
]
|
||||
|
||||
# Test calls with positional and keyword arguments
|
||||
CALLS_KWARGS = (
|
||||
CALLS_KWARGS = [
|
||||
# (func, args: tuple, kwargs: dict, result)
|
||||
|
||||
# Python function with 2 arguments
|
||||
|
|
@ -376,17 +407,51 @@ class FastCallTests(unittest.TestCase):
|
|||
(PYTHON_INSTANCE.method, (1,), {'arg2': 2}, [1, 2]),
|
||||
(PYTHON_INSTANCE.method, (), {'arg1': 1, 'arg2': 2}, [1, 2]),
|
||||
|
||||
# C function: METH_VARARGS | METH_KEYWORDS
|
||||
(max, ([],), {'default': 9}, 9),
|
||||
# C callables are added later
|
||||
]
|
||||
|
||||
# C type static method: METH_FASTCALL | METH_CLASS
|
||||
(int.from_bytes, (b'\x01\x00',), {'byteorder': 'little'}, 1),
|
||||
(int.from_bytes, (), {'bytes': b'\x01\x00', 'byteorder': 'little'}, 1),
|
||||
)
|
||||
# Add all the calling conventions and variants of C callables
|
||||
_instance = _testcapi.MethInstance()
|
||||
for obj, expected_self in (
|
||||
(_testcapi, _testcapi), # module-level function
|
||||
(_instance, _instance), # bound method
|
||||
(_testcapi.MethClass, _testcapi.MethClass), # class method on class
|
||||
(_testcapi.MethClass(), _testcapi.MethClass), # class method on inst.
|
||||
(_testcapi.MethStatic, None), # static method
|
||||
):
|
||||
CALLS_POSARGS.extend([
|
||||
(obj.meth_varargs, (1, 2), (expected_self, (1, 2))),
|
||||
(obj.meth_varargs_keywords,
|
||||
(1, 2), (expected_self, (1, 2), NULL_OR_EMPTY)),
|
||||
(obj.meth_fastcall, (1, 2), (expected_self, (1, 2))),
|
||||
(obj.meth_fastcall, (), (expected_self, ())),
|
||||
(obj.meth_fastcall_keywords,
|
||||
(1, 2), (expected_self, (1, 2), NULL_OR_EMPTY)),
|
||||
(obj.meth_fastcall_keywords,
|
||||
(), (expected_self, (), NULL_OR_EMPTY)),
|
||||
(obj.meth_noargs, (), expected_self),
|
||||
(obj.meth_o, (123, ), (expected_self, 123)),
|
||||
])
|
||||
|
||||
CALLS_KWARGS.extend([
|
||||
(obj.meth_varargs_keywords,
|
||||
(1, 2), {'x': 'y'}, (expected_self, (1, 2), {'x': 'y'})),
|
||||
(obj.meth_varargs_keywords,
|
||||
(), {'x': 'y'}, (expected_self, (), {'x': 'y'})),
|
||||
(obj.meth_varargs_keywords,
|
||||
(1, 2), {}, (expected_self, (1, 2), NULL_OR_EMPTY)),
|
||||
(obj.meth_fastcall_keywords,
|
||||
(1, 2), {'x': 'y'}, (expected_self, (1, 2), {'x': 'y'})),
|
||||
(obj.meth_fastcall_keywords,
|
||||
(), {'x': 'y'}, (expected_self, (), {'x': 'y'})),
|
||||
(obj.meth_fastcall_keywords,
|
||||
(1, 2), {}, (expected_self, (1, 2), NULL_OR_EMPTY)),
|
||||
])
|
||||
|
||||
def check_result(self, result, expected):
|
||||
if expected is IGNORE_RESULT:
|
||||
return
|
||||
if isinstance(expected, tuple) and expected[-1] is NULL_OR_EMPTY:
|
||||
if result[-1] in ({}, None):
|
||||
expected = (*expected[:-1], result[-1])
|
||||
self.assertEqual(result, expected)
|
||||
|
||||
def test_fastcall(self):
|
||||
|
|
@ -411,19 +476,11 @@ class FastCallTests(unittest.TestCase):
|
|||
result = _testcapi.pyobject_fastcalldict(func, args, None)
|
||||
self.check_result(result, expected)
|
||||
|
||||
# kwargs={}
|
||||
result = _testcapi.pyobject_fastcalldict(func, args, {})
|
||||
self.check_result(result, expected)
|
||||
|
||||
if not args:
|
||||
# args=NULL, nargs=0, kwargs=NULL
|
||||
result = _testcapi.pyobject_fastcalldict(func, None, None)
|
||||
self.check_result(result, expected)
|
||||
|
||||
# args=NULL, nargs=0, kwargs={}
|
||||
result = _testcapi.pyobject_fastcalldict(func, None, {})
|
||||
self.check_result(result, expected)
|
||||
|
||||
for func, args, kwargs, expected in self.CALLS_KWARGS:
|
||||
with self.subTest(func=func, args=args, kwargs=kwargs):
|
||||
result = _testcapi.pyobject_fastcalldict(func, args, kwargs)
|
||||
|
|
|
|||
|
|
@ -838,47 +838,66 @@ id(42)
|
|||
)
|
||||
self.assertIn('Garbage-collecting', gdb_output)
|
||||
|
||||
|
||||
@unittest.skipIf(python_is_optimized(),
|
||||
"Python was compiled with optimizations")
|
||||
# Some older versions of gdb will fail with
|
||||
# "Cannot find new threads: generic error"
|
||||
# unless we add LD_PRELOAD=PATH-TO-libpthread.so.1 as a workaround
|
||||
#
|
||||
# gdb will also generate many erroneous errors such as:
|
||||
# Function "meth_varargs" not defined.
|
||||
# This is because we are calling functions from an "external" module
|
||||
# (_testcapimodule) rather than compiled-in functions. It seems difficult
|
||||
# to suppress these. See also the comment in DebuggerTests.get_stack_trace
|
||||
def test_pycfunction(self):
|
||||
'Verify that "py-bt" displays invocations of PyCFunction instances'
|
||||
# Various optimizations multiply the code paths by which these are
|
||||
# called, so test a variety of calling conventions.
|
||||
for py_name, py_args, c_name, expected_frame_number in (
|
||||
('gmtime', '', 'time_gmtime', 1), # METH_VARARGS
|
||||
('len', '[]', 'builtin_len', 1), # METH_O
|
||||
('locals', '', 'builtin_locals', 1), # METH_NOARGS
|
||||
('iter', '[]', 'builtin_iter', 1), # METH_FASTCALL
|
||||
('sorted', '[]', 'builtin_sorted', 1), # METH_FASTCALL|METH_KEYWORDS
|
||||
for func_name, args, expected_frame in (
|
||||
('meth_varargs', '', 1),
|
||||
('meth_varargs_keywords', '', 1),
|
||||
('meth_o', '[]', 1),
|
||||
('meth_noargs', '', 1),
|
||||
('meth_fastcall', '', 1),
|
||||
('meth_fastcall_keywords', '', 1),
|
||||
):
|
||||
with self.subTest(c_name):
|
||||
cmd = ('from time import gmtime\n' # (not always needed)
|
||||
'def foo():\n'
|
||||
f' {py_name}({py_args})\n'
|
||||
'def bar():\n'
|
||||
' foo()\n'
|
||||
'bar()\n')
|
||||
# Verify with "py-bt":
|
||||
gdb_output = self.get_stack_trace(
|
||||
cmd,
|
||||
breakpoint=c_name,
|
||||
cmds_after_breakpoint=['bt', 'py-bt'],
|
||||
)
|
||||
self.assertIn(f'<built-in method {py_name}', gdb_output)
|
||||
for obj in (
|
||||
'_testcapi',
|
||||
'_testcapi.MethClass',
|
||||
'_testcapi.MethClass()',
|
||||
'_testcapi.MethStatic()',
|
||||
|
||||
# Verify with "py-bt-full":
|
||||
gdb_output = self.get_stack_trace(
|
||||
cmd,
|
||||
breakpoint=c_name,
|
||||
cmds_after_breakpoint=['py-bt-full'],
|
||||
)
|
||||
self.assertIn(
|
||||
f'#{expected_frame_number} <built-in method {py_name}',
|
||||
gdb_output,
|
||||
)
|
||||
# XXX: bound methods don't yet give nice tracebacks
|
||||
# '_testcapi.MethInstance()',
|
||||
):
|
||||
with self.subTest(f'{obj}.{func_name}'):
|
||||
cmd = textwrap.dedent(f'''
|
||||
import _testcapi
|
||||
def foo():
|
||||
{obj}.{func_name}({args})
|
||||
def bar():
|
||||
foo()
|
||||
bar()
|
||||
''')
|
||||
# Verify with "py-bt":
|
||||
gdb_output = self.get_stack_trace(
|
||||
cmd,
|
||||
breakpoint=func_name,
|
||||
cmds_after_breakpoint=['bt', 'py-bt'],
|
||||
)
|
||||
self.assertIn(f'<built-in method {func_name}', gdb_output)
|
||||
|
||||
# Verify with "py-bt-full":
|
||||
gdb_output = self.get_stack_trace(
|
||||
cmd,
|
||||
breakpoint=func_name,
|
||||
cmds_after_breakpoint=['py-bt-full'],
|
||||
)
|
||||
self.assertIn(
|
||||
f'#{expected_frame} <built-in method {func_name}',
|
||||
gdb_output,
|
||||
)
|
||||
|
||||
@unittest.skipIf(python_is_optimized(),
|
||||
"Python was compiled with optimizations")
|
||||
|
|
|
|||
|
|
@ -5176,6 +5176,83 @@ sequence_getitem(PyObject *self, PyObject *args)
|
|||
}
|
||||
|
||||
|
||||
/* Functions for testing C calling conventions (METH_*) are named meth_*,
|
||||
* e.g. "meth_varargs" for METH_VARARGS.
|
||||
*
|
||||
* They all return a tuple of their C-level arguments, with None instead
|
||||
* of NULL and Python tuples instead of C arrays.
|
||||
*/
|
||||
|
||||
|
||||
static PyObject*
|
||||
_null_to_none(PyObject* obj)
|
||||
{
|
||||
if (obj == NULL) {
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
Py_INCREF(obj);
|
||||
return obj;
|
||||
}
|
||||
|
||||
static PyObject*
|
||||
meth_varargs(PyObject* self, PyObject* args)
|
||||
{
|
||||
return Py_BuildValue("NO", _null_to_none(self), args);
|
||||
}
|
||||
|
||||
static PyObject*
|
||||
meth_varargs_keywords(PyObject* self, PyObject* args, PyObject* kwargs)
|
||||
{
|
||||
return Py_BuildValue("NON", _null_to_none(self), args, _null_to_none(kwargs));
|
||||
}
|
||||
|
||||
static PyObject*
|
||||
meth_o(PyObject* self, PyObject* obj)
|
||||
{
|
||||
return Py_BuildValue("NO", _null_to_none(self), obj);
|
||||
}
|
||||
|
||||
static PyObject*
|
||||
meth_noargs(PyObject* self, PyObject* ignored)
|
||||
{
|
||||
return _null_to_none(self);
|
||||
}
|
||||
|
||||
static PyObject*
|
||||
_fastcall_to_tuple(PyObject* const* args, Py_ssize_t nargs)
|
||||
{
|
||||
PyObject *tuple = PyTuple_New(nargs);
|
||||
if (tuple == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
for (Py_ssize_t i=0; i < nargs; i++) {
|
||||
Py_INCREF(args[i]);
|
||||
PyTuple_SET_ITEM(tuple, i, args[i]);
|
||||
}
|
||||
return tuple;
|
||||
}
|
||||
|
||||
static PyObject*
|
||||
meth_fastcall(PyObject* self, PyObject* const* args, Py_ssize_t nargs)
|
||||
{
|
||||
return Py_BuildValue(
|
||||
"NN", _null_to_none(self), _fastcall_to_tuple(args, nargs)
|
||||
);
|
||||
}
|
||||
|
||||
static PyObject*
|
||||
meth_fastcall_keywords(PyObject* self, PyObject* const* args,
|
||||
Py_ssize_t nargs, PyObject* kwargs)
|
||||
{
|
||||
PyObject *pyargs = _fastcall_to_tuple(args, nargs);
|
||||
if (pyargs == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
PyObject *pykwargs = _PyObject_Vectorcall((PyObject*)&PyDict_Type,
|
||||
args + nargs, 0, kwargs);
|
||||
return Py_BuildValue("NNN", _null_to_none(self), pyargs, pykwargs);
|
||||
}
|
||||
|
||||
static PyMethodDef TestMethods[] = {
|
||||
{"raise_exception", raise_exception, METH_VARARGS},
|
||||
{"raise_memoryerror", raise_memoryerror, METH_NOARGS},
|
||||
|
|
@ -5426,6 +5503,12 @@ static PyMethodDef TestMethods[] = {
|
|||
#endif
|
||||
{"write_unraisable_exc", test_write_unraisable_exc, METH_VARARGS},
|
||||
{"sequence_getitem", sequence_getitem, METH_VARARGS},
|
||||
{"meth_varargs", meth_varargs, METH_VARARGS},
|
||||
{"meth_varargs_keywords", (PyCFunction)(void(*)(void))meth_varargs_keywords, METH_VARARGS|METH_KEYWORDS},
|
||||
{"meth_o", meth_o, METH_O},
|
||||
{"meth_noargs", meth_noargs, METH_NOARGS},
|
||||
{"meth_fastcall", (PyCFunction)(void(*)(void))meth_fastcall, METH_FASTCALL},
|
||||
{"meth_fastcall_keywords", (PyCFunction)(void(*)(void))meth_fastcall_keywords, METH_FASTCALL|METH_KEYWORDS},
|
||||
{NULL, NULL} /* sentinel */
|
||||
};
|
||||
|
||||
|
|
@ -6086,6 +6169,72 @@ static PyTypeObject MethodDescriptor2_Type = {
|
|||
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | _Py_TPFLAGS_HAVE_VECTORCALL,
|
||||
};
|
||||
|
||||
static PyMethodDef meth_instance_methods[] = {
|
||||
{"meth_varargs", meth_varargs, METH_VARARGS},
|
||||
{"meth_varargs_keywords", (PyCFunction)(void(*)(void))meth_varargs_keywords, METH_VARARGS|METH_KEYWORDS},
|
||||
{"meth_o", meth_o, METH_O},
|
||||
{"meth_noargs", meth_noargs, METH_NOARGS},
|
||||
{"meth_fastcall", (PyCFunction)(void(*)(void))meth_fastcall, METH_FASTCALL},
|
||||
{"meth_fastcall_keywords", (PyCFunction)(void(*)(void))meth_fastcall_keywords, METH_FASTCALL|METH_KEYWORDS},
|
||||
{NULL, NULL} /* sentinel */
|
||||
};
|
||||
|
||||
|
||||
static PyTypeObject MethInstance_Type = {
|
||||
PyVarObject_HEAD_INIT(NULL, 0)
|
||||
"MethInstance",
|
||||
sizeof(PyObject),
|
||||
.tp_new = PyType_GenericNew,
|
||||
.tp_flags = Py_TPFLAGS_DEFAULT,
|
||||
.tp_methods = meth_instance_methods,
|
||||
.tp_doc = PyDoc_STR(
|
||||
"Class with normal (instance) methods to test calling conventions"),
|
||||
};
|
||||
|
||||
static PyMethodDef meth_class_methods[] = {
|
||||
{"meth_varargs", meth_varargs, METH_VARARGS|METH_CLASS},
|
||||
{"meth_varargs_keywords", (PyCFunction)(void(*)(void))meth_varargs_keywords, METH_VARARGS|METH_KEYWORDS|METH_CLASS},
|
||||
{"meth_o", meth_o, METH_O|METH_CLASS},
|
||||
{"meth_noargs", meth_noargs, METH_NOARGS|METH_CLASS},
|
||||
{"meth_fastcall", (PyCFunction)(void(*)(void))meth_fastcall, METH_FASTCALL|METH_CLASS},
|
||||
{"meth_fastcall_keywords", (PyCFunction)(void(*)(void))meth_fastcall_keywords, METH_FASTCALL|METH_KEYWORDS|METH_CLASS},
|
||||
{NULL, NULL} /* sentinel */
|
||||
};
|
||||
|
||||
|
||||
static PyTypeObject MethClass_Type = {
|
||||
PyVarObject_HEAD_INIT(NULL, 0)
|
||||
"MethClass",
|
||||
sizeof(PyObject),
|
||||
.tp_new = PyType_GenericNew,
|
||||
.tp_flags = Py_TPFLAGS_DEFAULT,
|
||||
.tp_methods = meth_class_methods,
|
||||
.tp_doc = PyDoc_STR(
|
||||
"Class with class methods to test calling conventions"),
|
||||
};
|
||||
|
||||
static PyMethodDef meth_static_methods[] = {
|
||||
{"meth_varargs", meth_varargs, METH_VARARGS|METH_STATIC},
|
||||
{"meth_varargs_keywords", (PyCFunction)(void(*)(void))meth_varargs_keywords, METH_VARARGS|METH_KEYWORDS|METH_STATIC},
|
||||
{"meth_o", meth_o, METH_O|METH_STATIC},
|
||||
{"meth_noargs", meth_noargs, METH_NOARGS|METH_STATIC},
|
||||
{"meth_fastcall", (PyCFunction)(void(*)(void))meth_fastcall, METH_FASTCALL|METH_STATIC},
|
||||
{"meth_fastcall_keywords", (PyCFunction)(void(*)(void))meth_fastcall_keywords, METH_FASTCALL|METH_KEYWORDS|METH_STATIC},
|
||||
{NULL, NULL} /* sentinel */
|
||||
};
|
||||
|
||||
|
||||
static PyTypeObject MethStatic_Type = {
|
||||
PyVarObject_HEAD_INIT(NULL, 0)
|
||||
"MethStatic",
|
||||
sizeof(PyObject),
|
||||
.tp_new = PyType_GenericNew,
|
||||
.tp_flags = Py_TPFLAGS_DEFAULT,
|
||||
.tp_methods = meth_static_methods,
|
||||
.tp_doc = PyDoc_STR(
|
||||
"Class with static methods to test calling conventions"),
|
||||
};
|
||||
|
||||
|
||||
static struct PyModuleDef _testcapimodule = {
|
||||
PyModuleDef_HEAD_INIT,
|
||||
|
|
@ -6172,6 +6321,21 @@ PyInit__testcapi(void)
|
|||
Py_INCREF(&Generic_Type);
|
||||
PyModule_AddObject(m, "Generic", (PyObject *)&Generic_Type);
|
||||
|
||||
if (PyType_Ready(&MethInstance_Type) < 0)
|
||||
return NULL;
|
||||
Py_INCREF(&MethInstance_Type);
|
||||
PyModule_AddObject(m, "MethInstance", (PyObject *)&MethInstance_Type);
|
||||
|
||||
if (PyType_Ready(&MethClass_Type) < 0)
|
||||
return NULL;
|
||||
Py_INCREF(&MethClass_Type);
|
||||
PyModule_AddObject(m, "MethClass", (PyObject *)&MethClass_Type);
|
||||
|
||||
if (PyType_Ready(&MethStatic_Type) < 0)
|
||||
return NULL;
|
||||
Py_INCREF(&MethStatic_Type);
|
||||
PyModule_AddObject(m, "MethStatic", (PyObject *)&MethStatic_Type);
|
||||
|
||||
PyRecursingInfinitelyError_Type.tp_base = (PyTypeObject *)PyExc_Exception;
|
||||
if (PyType_Ready(&PyRecursingInfinitelyError_Type) < 0) {
|
||||
return NULL;
|
||||
|
|
|
|||
Loading…
Reference in New Issue