Remove f_opcode_trace_set and fix a bug

python · markshannon · Nov 3, 2023 · Sep 15, 2023 · Sep 15, 2023 · Sep 15, 2023
commit dfc5aa6dba9a86ed8a545e642caef497f5ce69ce
@@ -189,7 +189,6 @@ struct _is {
    uint32_t next_func_version;

    _Py_GlobalMonitors monitors;
-    bool f_opcode_trace_set;
    bool sys_profile_initialized;
    bool sys_trace_initialized;
    Py_ssize_t sys_profiling_threads; /* Count of threads with c_profilefunc set */

@@ -127,7 +127,6 @@ frame_settrace_opcodes(PyFrameObject *f, PyObject* value, void *Py_UNUSED(ignore
    }
    if (value == Py_True) {
        f->f_trace_opcodes = 1;
-        _PyInterpreterState_GET()->f_opcode_trace_set = true;
        if (f->f_trace) {
            return _PyEval_SetOpcodeTrace(f, true);
        }

diff --git a/Python/legacy_tracing.c b/Python/legacy_tracing.c
@@ -243,14 +243,14 @@ sys_trace_instruction_func(
                        "Missing frame when calling trace function.");
        return NULL;
    }
-    if (!frame->f_trace_opcodes) {
+    PyThreadState *tstate = _PyThreadState_GET();
+    if (!tstate->c_tracefunc || !frame->f_trace_opcodes) {
        if (_PyEval_SetOpcodeTrace(frame, false) != 0) {
            return NULL;
        }
        Py_RETURN_NONE;
    }
    Py_INCREF(frame);
-    PyThreadState *tstate = _PyThreadState_GET();
    int err = tstate->c_tracefunc(tstate->c_traceobj, frame, self->event, Py_None);
    frame->f_lineno = 0;
    Py_DECREF(frame);

@@ -702,7 +702,6 @@ init_interpreter(PyInterpreterState *interp,
        /* Fix the self-referential, statically initialized fields. */
        interp->dtoa = (struct _dtoa_state)_dtoa_state_INIT(interp);
    }
-    interp->f_opcode_trace_set = false;
    interp->_initialized = 1;
    return _PyStatus_OK();
 }
@@ -947,7 +946,6 @@ interpreter_clear(PyInterpreterState *interp, PyThreadState *tstate)
        interp->code_watchers[i] = NULL;
    }
    interp->active_code_watchers = 0;
-    interp->f_opcode_trace_set = false;
    // XXX Once we have one allocator per interpreter (i.e.
    // per-interpreter GC) we must ensure that all of the interpreter's
    // objects have been cleaned up at the point.