Skip to content

[3.10] bpo-45116: Fix inlining regressions on Windows Release build #31459

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

Closed
wants to merge 3 commits into from
Closed

[3.10] bpo-45116: Fix inlining regressions on Windows Release build #31459

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87d2e7c
Take a log with diagnoses before the fix
neonene Feb 21, 2022
2d3cb28
Make switch-case smaller
neonene Feb 21, 2022
c2333fd
Disable diagnostic option
neonene Feb 21, 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
17 changes: 12 additions & 5 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ static PyObject * special_lookup(PyThreadState *, PyObject *, _Py_Identifier *);
static int check_args_iterable(PyThreadState *, PyObject *func, PyObject *vararg);
static void format_kwargs_error(PyThreadState *, PyObject *func, PyObject *kwargs);
static void format_awaitable_error(PyThreadState *, PyTypeObject *, int, int);
static void unknown_opcode_error(PyThreadState *, PyFrameObject *, int);

#define NAME_ERROR_MSG \
"name '%.200s' is not defined"
Expand Down Expand Up @@ -4418,11 +4419,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag)
_unknown_opcode:
#endif
default:
fprintf(stderr,
"XXX lineno: %d, opcode: %d\n",
PyFrame_GetLineNumber(f),
opcode);
_PyErr_SetString(tstate, PyExc_SystemError, "unknown opcode");
unknown_opcode_error(tstate, f, opcode);
goto error;

} /* switch */
Expand Down Expand Up @@ -6310,6 +6307,16 @@ format_awaitable_error(PyThreadState *tstate, PyTypeObject *type, int prevprevop
}
}

_Py_NO_INLINE static void
unknown_opcode_error(PyThreadState *tstate, PyFrameObject *f, int opcode)
{
fprintf(stderr,
"XXX lineno: %d, opcode: %d\n",
PyFrame_GetLineNumber(f),
opcode);
_PyErr_SetString(tstate, PyExc_SystemError, "unknown opcode");
}

static PyObject *
unicode_concatenate(PyThreadState *tstate, PyObject *v, PyObject *w,
PyFrameObject *f, const _Py_CODEUNIT *next_instr)
Expand Down