Move CHECK_EVAL_BREAKER in ENTER_EXECUTOR

python · Mar 29, 2024 · 773e016 · 773e016
1 parent 83315d6
commit 773e016
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -171,7 +171,7 @@ dummy_func(
  _Py_emscripten_signal_clock -= Py_EMSCRIPTEN_SIGNAL_HANDLING;
 #endif
  uintptr_t eval_breaker = _Py_atomic_load_uintptr_relaxed(&tstate->eval_breaker);
- uintptr_t version = _PyFrame_GetCode(frame)->_co_instrumentation_version;
+ uintptr_t version = FT_ATOMIC_LOAD_UINTPTR_ACQUIRE(_PyFrame_GetCode(frame)->_co_instrumentation_version);
  assert((version & _PY_EVAL_EVENTS_MASK) == 0);
  DEOPT_IF(eval_breaker != version);
  }
@@ -2391,7 +2391,6 @@ dummy_func(
  };
 
  tier1 inst(ENTER_EXECUTOR, (--)) {
- CHECK_EVAL_BREAKER();
  PyCodeObject *code = _PyFrame_GetCode(frame);
  _PyExecutorObject *executor = code->co_executors->executors[oparg & 255];
  assert(executor->vm_data.index == INSTR_OFFSET() - 1);
@@ -2400,6 +2399,7 @@ dummy_func(
  assert(tstate->previous_executor == NULL);
  tstate->previous_executor = Py_None;
  Py_INCREF(executor);
+ CHECK_EVAL_BREAKER();
  GOTO_TIER_TWO(executor);
  }
 

diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h