Thanks to visit codestin.com
Credit goes to github.com

Skip to content

GH-92239: Respect PEP 523 #92245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 4, 2022
Merged

GH-92239: Respect PEP 523 #92245

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c6e875f
Make sure that PEP 523 is supported, even when specializing first.
markshannon May 3, 2022
4fac45c
Avoid specialization trashing if PEP 523 is active
markshannon May 3, 2022
71505f9
Add news
markshannon May 3, 2022
42ae714
Test both simple and 'with defaults' specializations.
markshannon May 3, 2022
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
Next Next commit
Make sure that PEP 523 is supported, even when specializing first.
  • Loading branch information
@markshannon
markshannon committed May 3, 2022
commit c6e875f2014cae25d1f98108c2027ee8c5089d39
28 changes: 28 additions & 0 deletions Lib/test/test_capi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1142,5 +1142,33 @@ def test_frame_get_generator(self):
self.assertIs(gen, _testcapi.frame_getgenerator(frame))


SUFFICIENT_TO_SPECIALIZE = 50


class Test_Pep523API(unittest.TestCase):

def do_test(self, func):
calls = []
_testinternalcapi.set_eval_frame_record(calls)
for _ in range(SUFFICIENT_TO_SPECIALIZE):
func()
_testinternalcapi.set_eval_frame_default()
self.assertEqual(len(calls), SUFFICIENT_TO_SPECIALIZE)
for name in calls:
self.assertEqual(name, func.__name__)

def test_intercept_before_specialize(self):
def func1():
pass
self.do_test(func1)

def test_specialize_before_intercept(self):
def func2():
pass
for _ in range(SUFFICIENT_TO_SPECIALIZE):
func2()
self.do_test(func2)
Copy link
Contributor

Choose a reason for hiding this comment

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

more for my understanding - this test case fails without the added PEP-523 checks? (but the other one passes?)

Copy link
Member Author

Choose a reason for hiding this comment

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

Both tests should fail without the checks.



if __name__ == "__main__":
unittest.main()
37 changes: 36 additions & 1 deletion Modules/_testinternalcapi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@
#include "pycore_atomic_funcs.h" // _Py_atomic_int_get()
#include "pycore_bitutils.h" // _Py_bswap32()
#include "pycore_fileutils.h" // _Py_normpath
#include "pycore_frame.h" // _PyInterpreterFrame
#include "pycore_gc.h" // PyGC_Head
#include "pycore_hashtable.h" // _Py_hashtable_new()
#include "pycore_initconfig.h" // _Py_GetConfigsAsDict()
#include "pycore_pathconfig.h" // _PyPathConfig_ClearGlobal()
#include "pycore_interp.h" // _PyInterpreterState_GetConfigCopy()
#include "pycore_pyerrors.h" // _Py_UTF8_Edit_Cost()
#include "pycore_pystate.h" // _PyThreadState_GET()
#include "osdefs.h" // MAXPATHLEN
#include "osdefs.h" // MAXPATHLEN


static PyObject *
Expand Down Expand Up @@ -491,6 +492,38 @@ decode_locale_ex(PyObject *self, PyObject *args)
return res;
}

static PyObject *record_list = NULL;

static PyObject *
set_eval_frame_default(PyObject *self, PyObject *Py_UNUSED(args))
{
_PyInterpreterState_SetEvalFrameFunc(PyInterpreterState_Get(), _PyEval_EvalFrameDefault);
Py_CLEAR(record_list);
Py_RETURN_NONE;
}

static PyObject *
record_eval(PyThreadState *tstate, struct _PyInterpreterFrame *f, int exc)
{
PyList_Append(record_list, f->f_func->func_name);
return _PyEval_EvalFrameDefault(tstate, f, exc);
}


static PyObject *
set_eval_frame_record(PyObject *self, PyObject *list)
{
if (!PyList_Check(list)) {
PyErr_SetString(PyExc_TypeError, "argument must be a list");
return NULL;
}
Py_CLEAR(record_list);
Py_INCREF(list);
record_list = list;
_PyInterpreterState_SetEvalFrameFunc(PyInterpreterState_Get(), record_eval);
Py_RETURN_NONE;
}


static PyMethodDef TestMethods[] = {
{"get_configs", get_configs, METH_NOARGS},
Expand All @@ -508,6 +541,8 @@ static PyMethodDef TestMethods[] = {
{"get_getpath_codeobject", get_getpath_codeobject, METH_NOARGS, NULL},
{"EncodeLocaleEx", encode_locale_ex, METH_VARARGS},
{"DecodeLocaleEx", decode_locale_ex, METH_VARARGS},
{"set_eval_frame_default", set_eval_frame_default, METH_NOARGS, NULL},
{"set_eval_frame_record", set_eval_frame_record, METH_O, NULL},
{NULL, NULL} /* sentinel */
};

Expand Down
2 changes: 2 additions & 0 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4890,6 +4890,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int

TARGET(CALL_PY_EXACT_ARGS) {
assert(call_shape.kwnames == NULL);
DEOPT_IF(tstate->interp->eval_frame, CALL);
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't know how to verify that these opcodes (CALL_PY_EXACT_ARGS & CALL_PY_WITH_DEFAULTS) are the only ones where this check is needed - I trust you :)

Copy link
Member Author

Choose a reason for hiding this comment

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

Specializations of CALL and PRECALL listed here and here

_PyCallCache *cache = (_PyCallCache *)next_instr;
int is_meth = is_method(stack_pointer, oparg);
int argcount = oparg + is_meth;
Expand Down Expand Up @@ -4923,6 +4924,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int

TARGET(CALL_PY_WITH_DEFAULTS) {
assert(call_shape.kwnames == NULL);
DEOPT_IF(tstate->interp->eval_frame, CALL);
_PyCallCache *cache = (_PyCallCache *)next_instr;
int is_meth = is_method(stack_pointer, oparg);
int argcount = oparg + is_meth;
Expand Down