@@ -14,7 +14,7 @@ extern "C" {
1414#include "pycore_interp.h" // PyInterpreterState.eval_frame
1515#include "pycore_pystate.h" // _PyThreadState_GET()
1616#include "pycore_stats.h" // EVAL_CALL_STAT_INC()
17- #include "pycore_typedefs.h" // _PyInterpreterFrame
17+ #include "pycore_typedefs.h" // _PyControlRecord
1818
1919
2020/* Forward declarations */
@@ -115,7 +115,7 @@ extern void _PyPerfJit_WriteNamedCode(const void *code_addr,
115115#endif
116116
117117static inline PyObject *
118- _PyEval_EvalFrame (PyThreadState * tstate , _PyInterpreterFrame * frame , int throwflag )
118+ _PyEval_EvalFrame (PyThreadState * tstate , _PyControlRecord * frame , int throwflag )
119119{
120120 EVAL_CALL_STAT_INC (EVAL_CALL_TOTAL );
121121 if (tstate -> interp -> eval_frame == NULL ) {
@@ -126,7 +126,7 @@ _PyEval_EvalFrame(PyThreadState *tstate, _PyInterpreterFrame *frame, int throwfl
126126
127127#ifdef _Py_TIER2
128128_Py_CODEUNIT * _PyTier2Interpreter (
129- struct _PyExecutorObject * current_executor , _PyInterpreterFrame * frame ,
129+ struct _PyExecutorObject * current_executor , _PyControlRecord * frame ,
130130 _PyStackRef * stack_pointer , PyThreadState * tstate
131131);
132132#endif
@@ -254,7 +254,7 @@ PyAPI_FUNC(int) _Py_ReachedRecursionLimitWithMargin(
254254static inline void _Py_LeaveRecursiveCall (void ) {
255255}
256256
257- extern _PyInterpreterFrame * _PyEval_GetFrame (void );
257+ extern _PyControlRecord * _PyEval_GetFrame (void );
258258
259259extern PyObject * _PyEval_GetGlobalsFromRunningMain (PyThreadState * );
260260extern int _PyEval_EnsureBuiltins (
@@ -293,7 +293,7 @@ PyAPI_DATA(const size_t) _Py_FunctionAttributeOffsets[];
293293
294294PyAPI_FUNC (int ) _PyEval_CheckExceptStarTypeValid (PyThreadState * tstate , PyObject * right );
295295PyAPI_FUNC (int ) _PyEval_CheckExceptTypeValid (PyThreadState * tstate , PyObject * right );
296- PyAPI_FUNC (int ) _PyEval_ExceptionGroupMatch (_PyInterpreterFrame * , PyObject * exc_value , PyObject * match_type , PyObject * * match , PyObject * * rest );
296+ PyAPI_FUNC (int ) _PyEval_ExceptionGroupMatch (_PyControlRecord * , _PyInterpreterDataFrame * , PyObject * exc_value , PyObject * match_type , PyObject * * match , PyObject * * rest );
297297PyAPI_FUNC (void ) _PyEval_FormatAwaitableError (PyThreadState * tstate , PyTypeObject * type , int oparg );
298298PyAPI_FUNC (void ) _PyEval_FormatExcCheckArg (PyThreadState * tstate , PyObject * exc , const char * format_str , PyObject * obj );
299299PyAPI_FUNC (void ) _PyEval_FormatExcUnbound (PyThreadState * tstate , PyCodeObject * co , int oparg );
@@ -305,7 +305,7 @@ PyAPI_FUNC(PyObject *) _PyEval_LazyImportName(
305305 PyObject * locals , PyObject * name , PyObject * fromlist , PyObject * level ,
306306 int lazy );
307307PyAPI_FUNC (PyObject * ) _PyEval_LazyImportFrom (
308- PyThreadState * tstate , _PyInterpreterFrame * frame , PyObject * v , PyObject * name );
308+ PyThreadState * tstate , _PyControlRecord * frame , PyObject * v , PyObject * name );
309309PyAPI_FUNC (PyObject * ) _PyEval_ImportName (
310310 PyThreadState * tstate , PyObject * builtins , PyObject * globals ,
311311 PyObject * locals , PyObject * name , PyObject * fromlist , PyObject * level );
@@ -314,18 +314,19 @@ PyObject * _PyEval_ImportNameWithImport(
314314 PyObject * locals , PyObject * name , PyObject * fromlist , PyObject * level );
315315PyAPI_FUNC (PyObject * )_PyEval_MatchClass (PyThreadState * tstate , PyObject * subject , PyObject * type , Py_ssize_t nargs , PyObject * kwargs );
316316PyAPI_FUNC (PyObject * )_PyEval_MatchKeys (PyThreadState * tstate , PyObject * map , PyObject * keys );
317- PyAPI_FUNC (void ) _PyEval_MonitorRaise (PyThreadState * tstate , _PyInterpreterFrame * frame , _Py_CODEUNIT * instr );
318- PyAPI_FUNC (bool ) _PyEval_NoToolsForUnwind (PyThreadState * tstate , _PyInterpreterFrame * frame );
317+ PyAPI_FUNC (void ) _PyEval_MonitorRaise (PyThreadState * tstate , _PyControlRecord * frame , _Py_CODEUNIT * instr );
318+ PyAPI_FUNC (bool ) _PyEval_NoToolsForUnwind (PyThreadState * tstate , _PyControlRecord * frame );
319319PyAPI_FUNC (int ) _PyEval_UnpackIterableStackRef (PyThreadState * tstate , PyObject * v , int argcnt , int argcntafter , _PyStackRef * sp );
320- PyAPI_FUNC (void ) _PyEval_FrameClearAndPop (PyThreadState * tstate , _PyInterpreterFrame * frame );
320+ PyAPI_FUNC (void ) _PyEval_FrameClearAndPop (
321+ PyThreadState * tstate , _PyControlRecord * frame , _PyInterpreterDataFrame * fp );
321322PyAPI_FUNC (PyObject * * ) _PyObjectArray_FromStackRefArray (_PyStackRef * input , Py_ssize_t nargs , PyObject * * scratch );
322323
323324PyAPI_FUNC (void ) _PyObjectArray_Free (PyObject * * array , PyObject * * scratch );
324325
325326PyAPI_FUNC (PyObject * ) _PyEval_GetANext (PyObject * aiter );
326327PyAPI_FUNC (void ) _PyEval_LoadGlobalStackRef (PyObject * globals , PyObject * builtins , PyObject * name , _PyStackRef * writeto );
327328PyAPI_FUNC (PyObject * ) _PyEval_GetAwaitable (PyObject * iterable , int oparg );
328- PyAPI_FUNC (PyObject * ) _PyEval_LoadName (PyThreadState * tstate , _PyInterpreterFrame * frame , PyObject * name );
329+ PyAPI_FUNC (PyObject * ) _PyEval_LoadName (PyThreadState * tstate , _PyInterpreterDataFrame * fp , PyObject * name );
329330PyAPI_FUNC (int )
330331_Py_Check_ArgsIterable (PyThreadState * tstate , PyObject * func , PyObject * args );
331332PyAPI_FUNC (_PyStackRef ) _PyEval_GetIter (_PyStackRef iterable , _PyStackRef * null_or_index , int yield_from );
@@ -397,7 +398,7 @@ extern int _PyRunRemoteDebugger(PyThreadState *tstate);
397398#endif
398399
399400PyAPI_FUNC (_PyStackRef )
400- _PyForIter_VirtualIteratorNext (PyThreadState * tstate , struct _PyInterpreterFrame * frame , _PyStackRef iter , _PyStackRef * index_ptr );
401+ _PyForIter_VirtualIteratorNext (PyThreadState * tstate , struct _PyControlRecord * frame , _PyStackRef iter , _PyStackRef * index_ptr );
401402
402403/* Special methods used by LOAD_SPECIAL */
403404#define SPECIAL___ENTER__ 0
@@ -424,7 +425,7 @@ _Py_VectorCallInstrumentation_StackRefSteal(
424425 int total_args ,
425426 _PyStackRef kwnames ,
426427 bool call_instrumentation ,
427- _PyInterpreterFrame * frame ,
428+ _PyControlRecord * frame ,
428429 _Py_CODEUNIT * this_instr ,
429430 PyThreadState * tstate );
430431
@@ -474,7 +475,8 @@ _Py_BuildMap_StackRefSteal(
474475
475476PyAPI_FUNC (void )
476477_Py_assert_within_stack_bounds (
477- _PyInterpreterFrame * frame , _PyStackRef * stack_pointer ,
478+ _PyControlRecord * frame , _PyInterpreterDataFrame * fp ,
479+ _PyStackRef * stack_pointer ,
478480 const char * filename , int lineno );
479481
480482PyAPI_FUNC (_PyStackRef )
0 commit comments