Use fdata for frame data locals and parameters

python · ncoghlan · Aug 1, 2021 · Aug 14, 2021 · Aug 14, 2021 · Aug 14, 2021
commit ebda1d308426d09109360a7895e035d6bcd1352f
diff --git a/Include/cpython/ceval.h b/Include/cpython/ceval.h
@@ -22,7 +22,7 @@ PyAPI_FUNC(PyObject *) _PyEval_GetBuiltinId(_Py_Identifier *);
    flag was set, else return 0. */
 PyAPI_FUNC(int) PyEval_MergeCompilerFlags(PyCompilerFlags *cf);
 
-PyAPI_FUNC(PyObject *) _PyEval_EvalFrameDefault(PyThreadState *tstate, struct _Py_framedata *f, int exc);
+PyAPI_FUNC(PyObject *) _PyEval_EvalFrameDefault(PyThreadState *tstate, struct _Py_framedata *fdata, int exc);
 
 PyAPI_FUNC(void) _PyEval_SetSwitchInterval(unsigned long microseconds);
 PyAPI_FUNC(unsigned long) _PyEval_GetSwitchInterval(void);

diff --git a/Include/internal/pycore_ceval.h b/Include/internal/pycore_ceval.h
@@ -47,12 +47,12 @@ extern PyObject *_PyEval_BuiltinsFromGlobals(
 
 
 static inline PyObject*
-_PyEval_EvalFrame(PyThreadState *tstate, struct _Py_framedata *frame, int throwflag)
+_PyEval_EvalFrame(PyThreadState *tstate, struct _Py_framedata *fdata, int throwflag)
 {
     if (tstate->interp->eval_frame == NULL) {
-        return _PyEval_EvalFrameDefault(tstate, frame, throwflag);
+        return _PyEval_EvalFrameDefault(tstate, fdata, throwflag);
     }
-    return tstate->interp->eval_frame(tstate, frame, throwflag);
+    return tstate->interp->eval_frame(tstate, fdata, throwflag);
 }
 
 extern PyObject *

diff --git a/Include/internal/pycore_frame.h b/Include/internal/pycore_frame.h
@@ -123,9 +123,9 @@ static inline PyObject *_PyFrame_StackPop(_Py_framedata *f) {
     return f->localsplus[f->stacktop];
 }
 
-static inline void _PyFrame_StackPush(_Py_framedata *f, PyObject *value) {
-    f->localsplus[f->stacktop] = value;
-    f->stacktop++;
+static inline void _PyFrame_StackPush(_Py_framedata *fdata, PyObject *value) {
+    fdata->localsplus[fdata->stacktop] = value;
+    fdata->stacktop++;
 }
 
 #define FRAME_SPECIALS_SIZE ((sizeof(_Py_framedata)-1)/sizeof(PyObject *))
@@ -135,47 +135,47 @@ void _PyFrame_Copy(_Py_framedata *src, _Py_framedata *dest);
 /* Consumes reference to func */
 static inline void
 _PyFrame_InitializeSpecials(
-    _Py_framedata *frame, PyFunctionObject *func,
+    _Py_framedata *fdata, PyFunctionObject *func,
     PyObject *locals, int nlocalsplus)
 {
-    frame->func = func;
-    frame->code = (PyCodeObject *)Py_NewRef(func->func_code);
-    frame->builtins = func->func_builtins;
-    frame->globals = func->func_globals;
-    frame->locals = Py_XNewRef(locals);
-    frame->stacktop = nlocalsplus;
-    frame->frame_obj = NULL;
-    frame->lasti = -1;
-    frame->state = FRAME_CREATED;
-    frame->is_entry = false;
-    frame->is_generator = false;
+    fdata->func = func;
+    fdata->code = (PyCodeObject *)Py_NewRef(func->func_code);
+    fdata->builtins = func->func_builtins;
+    fdata->globals = func->func_globals;
+    fdata->locals = Py_XNewRef(locals);
+    fdata->stacktop = nlocalsplus;
+    fdata->frame_obj = NULL;
+    fdata->lasti = -1;
+    fdata->state = FRAME_CREATED;
+    fdata->is_entry = false;
+    fdata->is_generator = false;
 }
 
 /* Gets the pointer to the locals array
  * that precedes this frame.
  */
 static inline PyObject**
-_PyFrame_GetLocalsArray(_Py_framedata *frame)
+_PyFrame_GetLocalsArray(_Py_framedata *fdata)
 {
-    return frame->localsplus;
+    return fdata->localsplus;
 }
 
 static inline PyObject**
-_PyFrame_GetStackPointer(_Py_framedata *frame)
+_PyFrame_GetStackPointer(_Py_framedata *fdata)
 {
-    return frame->localsplus+frame->stacktop;
+    return fdata->localsplus+fdata->stacktop;
 }
 
 static inline void
-_PyFrame_SetStackPointer(_Py_framedata *frame, PyObject **stack_pointer)
+_PyFrame_SetStackPointer(_Py_framedata *fdata, PyObject **stack_pointer)
 {
-    frame->stacktop = (int)(stack_pointer - frame->localsplus);
+    fdata->stacktop = (int)(stack_pointer - fdata->localsplus);
 }
 
 /* For use by _PyFrame_GetFrameObject
   Do not call directly. */
 PyFrameObject *
-_PyFrame_MakeAndSetFrameObject(_Py_framedata *frame);
+_PyFrame_MakeAndSetFrameObject(_Py_framedata *fdata);
 
 /* Gets the PyFrameObject for this frame, lazily
  * creating it if necessary.
@@ -200,16 +200,16 @@ _PyFrame_GetFrameObject(_Py_framedata *fdata)
  * frames like the ones in generators and coroutines.
  */
 void
-_PyFrame_Clear(_Py_framedata * frame);
+_PyFrame_Clear(_Py_framedata * fdata);
 
 int
-_PyFrame_Traverse(_Py_framedata *frame, visitproc visit, void *arg);
+_PyFrame_Traverse(_Py_framedata *fdata, visitproc visit, void *arg);
 
 int
-_PyFrame_FastToLocalsWithError(_Py_framedata *frame);
+_PyFrame_FastToLocalsWithError(_Py_framedata *fdata);
 
 void
-_PyFrame_LocalsToFast(_Py_framedata *frame, int clear);
+_PyFrame_LocalsToFast(_Py_framedata *fdata, int clear);
 
 extern _Py_framedata *
 _PyThreadState_BumpFramePointerSlow(PyThreadState *tstate, size_t size);
@@ -229,7 +229,7 @@ _PyThreadState_BumpFramePointer(PyThreadState *tstate, size_t size)
     return _PyThreadState_BumpFramePointerSlow(tstate, size);
 }
 
-void _PyThreadState_PopFrame(PyThreadState *tstate, _Py_framedata *frame);
+void _PyThreadState_PopFrame(PyThreadState *tstate, _Py_framedata *fdata);
 
 /* Consume reference to func */
 _Py_framedata *

@@ -630,14 +630,14 @@ frame_dealloc(PyFrameObject *f)
     if (f->f_owns_frame) {
         f->f_owns_frame = 0;
         assert(f->f_fdata == (_Py_framedata *)f->_f_frame_data);
-        _Py_framedata *frame = (_Py_framedata *)f->_f_frame_data;
+        _Py_framedata *fdata = (_Py_framedata *)f->_f_frame_data;
         /* Don't clear code object until the end */
-        co = frame->code;
-        frame->code = NULL;
-        Py_CLEAR(frame->func);
-        Py_CLEAR(frame->locals);
-        PyObject **locals = _PyFrame_GetLocalsArray(frame);
-        for (int i = 0; i < frame->stacktop; i++) {
+        co = fdata->code;
+        fdata->code = NULL;
+        Py_CLEAR(fdata->func);
+        Py_CLEAR(fdata->locals);
+        PyObject **locals = _PyFrame_GetLocalsArray(fdata);
+        for (int i = 0; i < fdata->stacktop; i++) {
             Py_CLEAR(locals[i]);
         }
     }
@@ -771,14 +771,14 @@ PyTypeObject PyFrame_Type = {
 };
 
 static void
 init_frame(_Py_framedata *frame, PyFunctionObject *func, PyObject *locals)
+init_frame(_Py_framedata *fdata, PyFunctionObject *func, PyObject *locals)
 {
     /* _PyFrame_InitializeSpecials consumes reference to func */
     Py_INCREF(func);
     PyCodeObject *code = (PyCodeObject *)func->func_code;
-    _PyFrame_InitializeSpecials(frame, func, locals, code->co_nlocalsplus);
+    _PyFrame_InitializeSpecials(fdata, func, locals, code->co_nlocalsplus);
     for (Py_ssize_t i = 0; i < code->co_nlocalsplus; i++) {
-        frame->localsplus[i] = NULL;
+        fdata->localsplus[i] = NULL;
     }
 }
 
@@ -849,30 +849,30 @@ _PyFrame_OpAlreadyRan(_Py_framedata *fdata, int opcode, int oparg)
 }
 
 int
-_PyFrame_FastToLocalsWithError(_Py_framedata *frame) {
+_PyFrame_FastToLocalsWithError(_Py_framedata *fdata) {
     /* Merge fast locals into f->locals */
     PyObject *locals;
     PyObject **fast;
     PyCodeObject *co;
-    locals = frame->locals;
+    locals = fdata->locals;
     if (locals == NULL) {
-        locals = frame->locals = PyDict_New();
+        locals = fdata->locals = PyDict_New();
         if (locals == NULL)
             return -1;
     }
-    co = frame->code;
-    fast = _PyFrame_GetLocalsArray(frame);
-    if (frame->lasti < 0 && _Py_OPCODE(co->co_firstinstr[0]) == COPY_FREE_VARS) {
+    co = fdata->code;
+    fast = _PyFrame_GetLocalsArray(fdata);
+    if (fdata->lasti < 0 && _Py_OPCODE(co->co_firstinstr[0]) == COPY_FREE_VARS) {
         /* Free vars have not been initialized -- Do that */
-        PyCodeObject *co = frame->code;
-        PyObject *closure = frame->func->func_closure;
+        PyCodeObject *co = fdata->code;
+        PyObject *closure = fdata->func->func_closure;
         int offset = co->co_nlocals + co->co_nplaincellvars;
         for (int i = 0; i < co->co_nfreevars; ++i) {
             PyObject *o = PyTuple_GET_ITEM(closure, i);
             Py_INCREF(o);
-            frame->localsplus[offset + i] = o;
+            fdata->localsplus[offset + i] = o;
         }
-        frame->lasti = 0;
+        fdata->lasti = 0;
     }
     for (int i = 0; i < co->co_nlocalsplus; i++) {
         _PyLocals_Kind kind = _PyLocals_GetKind(co->co_localspluskinds, i);
@@ -891,7 +891,7 @@ _PyFrame_FastToLocalsWithError(_Py_framedata *frame) {
 
         PyObject *name = PyTuple_GET_ITEM(co->co_localsplusnames, i);
         PyObject *value = fast[i];
-        if (frame->state != FRAME_CLEARED) {
+        if (fdata->state != FRAME_CLEARED) {
             if (kind & CO_FAST_FREE) {
                 // The cell was set by COPY_FREE_VARS.
                 assert(value != NULL && PyCell_Check(value));
@@ -904,7 +904,7 @@ _PyFrame_FastToLocalsWithError(_Py_framedata *frame) {
                 // run yet.
                 if (value != NULL) {
                     if (PyCell_Check(value) &&
-                            _PyFrame_OpAlreadyRan(frame, MAKE_CELL, i)) {
+                            _PyFrame_OpAlreadyRan(fdata, MAKE_CELL, i)) {
                         // (likely) MAKE_CELL must have executed already.
                         value = PyCell_GET(value);
                     }
@@ -960,18 +960,18 @@ PyFrame_FastToLocals(PyFrameObject *f)
 }
 
 void
-_PyFrame_LocalsToFast(_Py_framedata *frame, int clear)
+_PyFrame_LocalsToFast(_Py_framedata *fdata, int clear)
 {
     /* Merge locals into fast locals */
     PyObject *locals;
     PyObject **fast;
     PyObject *error_type, *error_value, *error_traceback;
     PyCodeObject *co;
-    locals = frame->locals;
+    locals = fdata->locals;
     if (locals == NULL)
         return;
-    fast = _PyFrame_GetLocalsArray(frame);
-    co = frame->code;
+    fast = _PyFrame_GetLocalsArray(fdata);
+    co = fdata->code;
 
     PyErr_Fetch(&error_type, &error_value, &error_traceback);
     for (int i = 0; i < co->co_nlocalsplus; i++) {
@@ -1001,7 +1001,7 @@ _PyFrame_LocalsToFast(_Py_framedata *frame, int clear)
         else if (kind & CO_FAST_CELL && oldvalue != NULL) {
             /* Same test as in PyFrame_FastToLocals() above. */
             if (PyCell_Check(oldvalue) &&
-                    _PyFrame_OpAlreadyRan(frame, MAKE_CELL, i)) {
+                    _PyFrame_OpAlreadyRan(fdata, MAKE_CELL, i)) {
                 // (likely) MAKE_CELL must have executed already.
                 cell = oldvalue;
             }