fix

corona10 · corona10 · commit 21c40033fd51 · 2026-01-15T02:30:47.000+09:00
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -1460,7 +1460,6 @@ stop_tracing_and_jit(PyThreadState *tstate, _PyInterpreterFrame *frame)
     if (!_PyErr_Occurred(tstate) && !_is_sys_tracing) {
         err = _PyOptimizer_Optimize(frame, tstate);
     }
-<<<<<<< HEAD
     _PyThreadStateImpl *_tstate = (_PyThreadStateImpl *)tstate;
     // Deal with backoffs
     _PyJitTracerState *tracer = _tstate->jit_tracer_state;

Original file line number	Diff line number	Diff line change
`@@ -1460,7 +1460,6 @@ stop_tracing_and_jit(PyThreadState tstate, _PyInterpreterFrame frame)`
`1460`	`1460`	`if (!_PyErr_Occurred(tstate) && !_is_sys_tracing) {`
`1461`	`1461`	`err = _PyOptimizer_Optimize(frame, tstate);`
`1462`	`1462`	`}`
`1463`		`-<<<<<<< HEAD`
`1464`	`1463`	`_PyThreadStateImpl _tstate = (_PyThreadStateImpl )tstate;`
`1465`	`1464`	`// Deal with backoffs`
`1466`	`1465`	`_PyJitTracerState *tracer = _tstate->jit_tracer_state;`