Pewarta Proxy

📋 Server Request & Proxy Logs

Loading active proxy settings...
Developed by Khairul Adha (adhexa.id)
Mengambil log server...

⚙️ Pengaturan Proxy Target

Skip to content

gh-98831: Modernize CALL_FUNCTION_EX #101627

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
gvanrossum merged 3 commits into from
Feb 8, 2023
Merged

gh-98831: Modernize CALL_FUNCTION_EX #101627

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c43d20b
Special-case CHECK_EVAL_BREAKER()
gvanrossum Feb 3, 2023
f2bad0d
Modernize CALL_FUNCTION_EX
gvanrossum Feb 7, 2023
19307ba
Fix crash due to refcount shenanigans
gvanrossum Feb 7, 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
Fix crash due to refcount shenanigans 
Also avoid compiler warning for unused variable 'null'
(used in assert only).
  • Loading branch information
@gvanrossum
gvanrossum committed Feb 7, 2023
commit 19307bad9df775d7db31c0df1e806486293c8cc2
9 changes: 5 additions & 4 deletions Python/bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2949,7 +2949,7 @@ dummy_func(
CHECK_EVAL_BREAKER();
}

inst(CALL_FUNCTION_EX, (null, func, callargs, kwargs if (oparg & 1) -- result)) {
inst(CALL_FUNCTION_EX, (unused, func, callargs, kwargs if (oparg & 1) -- result)) {
if (oparg & 1) {
// DICT_MERGE is called before this opcode if there are kwargs.
// It converts all dict subtypes in kwargs into regular dicts.
Expand All @@ -2959,10 +2959,11 @@ dummy_func(
if (check_args_iterable(tstate, func, callargs) < 0) {
goto error;
}
Py_SETREF(callargs, PySequence_Tuple(callargs));
if (callargs == NULL) {
PyObject *tuple = PySequence_Tuple(callargs);
if (tuple == NULL) {
goto error;
}
Py_SETREF(callargs, tuple);
}
assert(PyTuple_CheckExact(callargs));

Expand All @@ -2971,7 +2972,7 @@ dummy_func(
Py_DECREF(callargs);
Py_XDECREF(kwargs);

assert(null == NULL);
assert(PEEK(3 + (oparg & 1)) == NULL);
ERROR_IF(result == NULL, error);
CHECK_EVAL_BREAKER();
}
Expand Down
8 changes: 4 additions & 4 deletions Python/generated_cases.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.