Skip to content

Commit 49eb82d

Browse files
committed
do not change signature
1 parent 078036e commit 49eb82d

File tree

5 files changed

+8
-6
lines changed

5 files changed

+8
-6
lines changed

Include/internal/pycore_ceval.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ PyAPI_DATA(const conversion_func) _PyEval_ConversionFuncs[];
247247

248248
PyAPI_FUNC(int) _PyEval_CheckExceptStarTypeValid(PyThreadState *tstate, PyObject* right);
249249
PyAPI_FUNC(int) _PyEval_CheckExceptTypeValid(PyThreadState *tstate, PyObject* right);
250-
PyAPI_FUNC(int) _PyEval_ExceptionGroupMatch(_PyInterpreterFrame *, PyObject* exc_value, PyObject *match_type, PyObject **match, PyObject **rest);
250+
PyAPI_FUNC(int) _PyEval_ExceptionGroupMatch(PyObject* exc_value, PyObject *match_type, PyObject **match, PyObject **rest);
251251
PyAPI_FUNC(void) _PyEval_FormatAwaitableError(PyThreadState *tstate, PyTypeObject *type, int oparg);
252252
PyAPI_FUNC(void) _PyEval_FormatExcCheckArg(PyThreadState *tstate, PyObject *exc, const char *format_str, PyObject *obj);
253253
PyAPI_FUNC(void) _PyEval_FormatExcUnbound(PyThreadState *tstate, PyCodeObject *co, int oparg);

Python/bytecodes.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2340,7 +2340,7 @@ dummy_func(
23402340

23412341
match = NULL;
23422342
rest = NULL;
2343-
int res = _PyEval_ExceptionGroupMatch(frame, exc_value, match_type,
2343+
int res = _PyEval_ExceptionGroupMatch(exc_value, match_type,
23442344
&match, &rest);
23452345
DECREF_INPUTS();
23462346
ERROR_IF(res < 0, error);

Python/ceval.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1992,8 +1992,8 @@ do_raise(PyThreadState *tstate, PyObject *exc, PyObject *cause)
19921992
*/
19931993

19941994
int
1995-
_PyEval_ExceptionGroupMatch(_PyInterpreterFrame *frame, PyObject* exc_value,
1996-
PyObject *match_type, PyObject **match, PyObject **rest)
1995+
_PyEval_ExceptionGroupMatch(PyObject* exc_value, PyObject *match_type,
1996+
PyObject **match, PyObject **rest)
19971997
{
19981998
if (Py_IsNone(exc_value)) {
19991999
*match = Py_NewRef(Py_None);
@@ -2019,6 +2019,8 @@ _PyEval_ExceptionGroupMatch(_PyInterpreterFrame *frame, PyObject* exc_value,
20192019
if (wrapped == NULL) {
20202020
return -1;
20212021
}
2022+
PyThreadState *tstate = _PyThreadState_GET();
2023+
_PyInterpreterFrame *frame = _PyThreadState_GetFrame(tstate);
20222024
PyFrameObject *f = _PyFrame_GetFrameObject(frame);
20232025
if (f != NULL) {
20242026
PyObject *tb = _PyTraceBack_FromFrame(NULL, f);

Python/executor_cases.c.h

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Python/generated_cases.c.h

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)