merge from upstream

Author: Fidget-Spinner

Python/bytecodes.c

@@ -5392,10 +5392,7 @@ dummy_func(
 
         tier2 op(_ERROR_POP_N, (target/2 --)) {
             assert(oparg == 0);
-            _Py_CODEUNIT *current_instr = _PyFrame_GetBytecode(frame) + target;
-            _Py_CODEUNIT *next_instr = current_instr + 1 + _PyOpcode_Caches[_PyOpcode_Deopt[current_instr->op.code]];
-            // gh-140104: The exception handler expects frame->instr_ptr to be pointing to next_instr, not this_instr!
-            frame->instr_ptr = next_instr;
+            frame->instr_ptr = _PyFrame_GetBytecode(frame) + target;
             SYNC_SP();
             GOTO_TIER_ONE(NULL);
         }

Python/executor_cases.c.h

@@ -1352,7 +1352,6 @@ uop_optimize(
     assert(length <= UOP_MAX_TRACE_LENGTH);
 
     // Check executor coldness
-    PyThreadState *tstate = PyThreadState_Get();
     // It's okay if this ends up going negative.
     if (--tstate->interp->executor_creation_counter == 0) {
         _Py_set_eval_breaker_bit(tstate, _PY_EVAL_JIT_INVALIDATE_COLD_BIT);