Merge remote-tracking branch 'origin/main' into bpo-44800-rename-inte…

…rpreter-frames
python · ncoghlan · Aug 1, 2021 · Aug 14, 2021 · Aug 14, 2021 · Aug 14, 2021
commit cd340b07f09258b457be89a575fc0d881826e2e8
@@ -60,15 +60,15 @@ static PyObject * do_call_core(
 #ifdef LLTRACE
 static int lltrace;
 static int prtrace(PyThreadState *, PyObject *, const char *);
-static void lltrace_instruction(InterpreterFrame *frame, int opcode, int oparg)
+static void lltrace_instruction(_Py_framedata *fdata, int opcode, int oparg)
 {
     if (HAS_ARG(opcode)) {
         printf("%d: %d, %d\n",
-                frame->f_lasti, opcode, oparg);
+                fdata->lasti, opcode, oparg);
     }
     else {
         printf("%d: %d\n",
-                frame->f_lasti, opcode);
+                fdata->lasti, opcode);
     }
 }
 #endif
@@ -1435,7 +1435,7 @@ eval_frame_handle_pending(PyThreadState *tstate)
 #define LOCALS() fdata->locals
 
 static int
-trace_function_entry(PyThreadState *tstate, InterpreterFrame *frame)
+trace_function_entry(PyThreadState *tstate, _Py_framedata *fdata)
 {
     if (tstate->c_tracefunc != NULL) {
         /* tstate->c_tracefunc, if defined, is a
@@ -1453,7 +1453,7 @@ trace_function_entry(PyThreadState *tstate, InterpreterFrame *frame)
             whenever an exception is detected. */
         if (call_trace_protected(tstate->c_tracefunc,
                                     tstate->c_traceobj,
-                                    tstate, frame,
+                                    tstate, fdata,
                                     PyTrace_CALL, Py_None)) {
             /* Trace function raised an error */
             return -1;
@@ -1464,7 +1464,7 @@ trace_function_entry(PyThreadState *tstate, InterpreterFrame *frame)
             return itself and isn't called for "line" events */
         if (call_trace_protected(tstate->c_profilefunc,
                                     tstate->c_profileobj,
-                                    tstate, frame,
+                                    tstate, fdata,
                                     PyTrace_CALL, Py_None)) {
             /* Profile function raised an error */
             return -1;
@@ -1506,50 +1506,19 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _Py_framedata *fdata, int throwf
     cframe.previous = prev_cframe;
     tstate->cframe = &cframe;
 
-    /* push execution frame */
+    /* push frame */
     tstate->fdata = fdata;
-    co = fdata->code;
 
     if (cframe.use_tracing) {
-        if (tstate->c_tracefunc != NULL) {
-            /* tstate->c_tracefunc, if defined, is a
-               function that will be called on *every* entry
-               to a code block.  Its return value, if not
-               None, is a function that will be called at
-               the start of each executed line of code.
-               (Actually, the function must return itself
-               in order to continue tracing.)  The trace
-               functions are called with three arguments:
-               a pointer to the current frame, a string
-               indicating why the function is called, and
-               an argument which depends on the situation.
-               The global trace function is also called
-               whenever an exception is detected. */
-            if (call_trace_protected(tstate->c_tracefunc,
-                                     tstate->c_traceobj,
-                                     tstate, fdata,
-                                     PyTrace_CALL, Py_None)) {
-                /* Trace function raised an error */
-                goto exit_eval_frame;
-            }
-        }
-        if (tstate->c_profilefunc != NULL) {
-            /* Similar for c_profilefunc, except it needn't
-               return itself and isn't called for "line" events */
-            if (call_trace_protected(tstate->c_profilefunc,
-                                     tstate->c_profileobj,
-                                     tstate, fdata,
-                                     PyTrace_CALL, Py_None)) {
-                /* Profile function raised an error */
-                goto exit_eval_frame;
-            }
+        if (trace_function_entry(tstate, fdata)) {
+            goto exit_eval_frame;
         }
     }
 
     if (PyDTrace_FUNCTION_ENTRY_ENABLED())
         dtrace_function_entry(fdata);
 
-    PyCodeObject *co = frame->f_code;
+    PyCodeObject *co = fdata->code;
     /* Increment the warmup counter and quicken if warm enough
      * _Py_Quicken is idempotent so we don't worry about overflow */
     if (!PyCodeObject_IsWarmedUp(co)) {
@@ -1562,10 +1531,10 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _Py_framedata *fdata, int throwf
     }
 
 
-    names = co->co_names;
-    consts = co->co_consts;
-    localsplus = _Py_framedata_GetLocalsArray(fdata);
-    first_instr = co->co_firstinstr;
+    PyObject *names = co->co_names;
+    PyObject *consts = co->co_consts;
+    PyObject **localsplus = _Py_framedata_GetLocalsArray(fdata);
+    _Py_CODEUNIT *first_instr = co->co_firstinstr;
     /*
        fdata->lasti refers to the index of the last instruction,
        unless it's -1 in which case next_instr should be first_instr.
@@ -1582,8 +1551,8 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _Py_framedata *fdata, int throwf
        to the beginning of the combined pair.)
     */
     assert(fdata->lasti >= -1);
-    next_instr = first_instr + fdata->lasti + 1;
-    stack_pointer = fdata->stack + fdata->stackdepth;
+    _Py_CODEUNIT *next_instr = first_instr + fdata->lasti + 1;
+    PyObject **stack_pointer = fdata->stack + fdata->stackdepth;
     /* Set stackdepth to -1.
      * Update when returning or calling trace function.
        Having f_stackdepth <= 0 ensures that invalid
@@ -1692,21 +1661,10 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _Py_framedata *fdata, int throwf
         DISPATCH_GOTO();
     }
 
-#ifdef LLTRACE
-        /* Instruction tracing */
-
-        if (lltrace) {
-            if (HAS_ARG(opcode)) {
-                printf("%d: %d, %d\n",
-                       fdata->lasti, opcode, oparg);
-            }
-            else {
-                printf("%d: %d\n",
-                       fdata->lasti, opcode);
-            }
-        }
-#endif
-
+    /* Start instructions */
+#if USE_COMPUTED_GOTOS
+    {
+#else
     dispatch_opcode:
         switch (opcode) {
 #endif
@@ -4674,8 +4632,8 @@ MISS_WITH_OPARG_COUNTER(BINARY_SUBSCR)
                 PyObject *o = POP();
                 Py_XDECREF(o);
             }
-            frame->stackdepth = 0;
-            frame->f_state = FRAME_RAISED;
+            fdata->stackdepth = 0;
+            fdata->state = FRAME_RAISED;
             goto exiting;
         }
 
@@ -4717,8 +4675,6 @@ MISS_WITH_OPARG_COUNTER(BINARY_SUBSCR)
         PRE_DISPATCH_GOTO();
         DISPATCH_GOTO();
     }
-    fdata->stackdepth = 0;
-    fdata->state = FRAME_RAISED;
 exiting:
     if (cframe.use_tracing) {
        if (tstate->c_tracefunc) {