Visitar URL original
gh-98003: Inline call frames for CALL_FUNCTION_EX by Fidget-Spinner · Pull Request #98004 · python/cpython · GitHub
Skip to content

gh-98003: Inline call frames for CALL_FUNCTION_EX #98004

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
Fidget-Spinner merged 20 commits into from
Apr 30, 2023
+148 −55
Merged

gh-98003: Inline call frames for CALL_FUNCTION_EX #98004

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
830084c
Specialize CALL_FUNCTION_EX
Fidget-Spinner Oct 6, 2022
d9fbb11
📜🤖 Added by blurb_it.
blurb-it[bot] Oct 6, 2022
e724666
fix refleak
Fidget-Spinner Oct 6, 2022
01cbef6
Merge branch 'call_function_ex_inline_3' of https://github.com/Fidget…
Fidget-Spinner Oct 6, 2022
92fead8
re-order STACK_SHRINK to fix error case
Fidget-Spinner Oct 6, 2022
84d0f8b
Inline instead of specializing
Fidget-Spinner Oct 7, 2022
1955f19
reduce diff
Fidget-Spinner Oct 7, 2022
eb25c1b
temper expectations
Fidget-Spinner Oct 7, 2022
3f409da
Add newline
Fidget-Spinner Oct 7, 2022
09b2528
remove unused variable
Fidget-Spinner Oct 11, 2022
f0d77dc
remove unused function prototype
Fidget-Spinner Nov 24, 2022
898c75d
Merge remote-tracking branch 'upstream/main' into call_function_ex_in…
Fidget-Spinner Nov 24, 2022
b933f6e
Use new case regenerator
Fidget-Spinner Nov 24, 2022
06ddc00
Apply Mark's and Brandt's suggestion
Fidget-Spinner Nov 30, 2022
bfab4dc
Run --regen
Fidget-Spinner Dec 1, 2022
80194fb
Merge remote-tracking branch 'upstream/main' into call_function_ex_in…
Fidget-Spinner Apr 27, 2023
dfd6b01
Fix merge problems
Fidget-Spinner Apr 27, 2023
1afff6d
Update generated_cases.c.h
Fidget-Spinner Apr 28, 2023
f1a9465
Update Python/bytecodes.c
Fidget-Spinner Apr 29, 2023
94782c3
Update generated_cases.c.h
Fidget-Spinner Apr 29, 2023
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
Prev Previous commit
Next Next commit
re-order STACK_SHRINK to fix error case
  • Loading branch information
@Fidget-Spinner
Fidget-Spinner committed Oct 6, 2022
commit 92fead82dbf0680eeacaa970aed957a892e97d31
4 changes: 2 additions & 2 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4838,7 +4838,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
DEOPT_IF(!PyTuple_CheckExact(callargs), CALL_FUNCTION_EX);
Py_ssize_t nargs = PyTuple_GET_SIZE(callargs);
DEOPT_IF(!Py_IS_TYPE(func, &PyFunction_Type), CALL_FUNCTION_EX);
STACK_SHRINK(3);
STACK_SHRINK(3); /* Get rid of callargs, func and NULL */
STAT_INC(CALL_FUNCTION_EX, hit);

int code_flags = ((PyCodeObject *)PyFunction_GET_CODE(func))->co_flags;
Expand Down Expand Up @@ -4886,14 +4886,14 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
DEOPT_IF(kwargs != NULL &&
((PyDictObject *)kwargs)->ma_keys->dk_kind != DICT_KEYS_UNICODE, CALL_FUNCTION_EX);
STAT_INC(CALL_FUNCTION_EX, hit);
STACK_SHRINK(2 + has_kwargs); /* Get rid of kwargs, callargs, func */

// This is slower but CPython promises to check all non-vectorcall
// function calls.
if (_Py_EnterRecursiveCallTstate(tstate, " while calling a Python object")) {
goto error;
}

STACK_SHRINK(2 + has_kwargs); /* Get rid of kwargs, callargs, func */
/* res = func(self, args, nargs, kwnames) */
PyCFunction cfunc = PyCFunction_GET_FUNCTION(func);
PyObject *res = ((PyCFunctionWithKeywords)(void(*)(void))cfunc)(
Expand Down