Fix incorrect edit and optimizer check.

markshannon · markshannon · commit f4d7149b2761 · 2024-04-26T15:36:12.000+01:00
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -4233,7 +4233,7 @@ dummy_func(
 #endif
             uintptr_t eval_breaker = _Py_atomic_load_uintptr_relaxed(&tstate->eval_breaker);
             EXIT_IF(eval_breaker & _PY_EVAL_EVENTS_MASK);
-            EXIT_IF(eval_breaker == FT_ATOMIC_LOAD_UINTPTR_ACQUIRE(_PyFrame_GetCode(frame)->_co_instrumentation_version));
+            assert(eval_breaker == FT_ATOMIC_LOAD_UINTPTR_ACQUIRE(_PyFrame_GetCode(frame)->_co_instrumentation_version));
         }
 
         tier2 op(_EVAL_BREAKER_EXIT, (--)) {
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
diff --git a/Python/optimizer.c b/Python/optimizer.c
@@ -1086,6 +1086,7 @@ sanity_check(_PyExecutorObject *executor)
         CHECK(
             opcode == _DEOPT ||
             opcode == _SIDE_EXIT ||
+            opcode == _EVAL_BREAKER_EXIT ||
             opcode == _ERROR_POP_N);
         if (opcode == _SIDE_EXIT) {
             CHECK(inst->format == UOP_FORMAT_EXIT);

Original file line number	Diff line number	Diff line change
`@@ -4233,7 +4233,7 @@ dummy_func(`
`4233`	`4233`	`#endif`
`4234`	`4234`	`uintptr_t eval_breaker = _Py_atomic_load_uintptr_relaxed(&tstate->eval_breaker);`
`4235`	`4235`	`EXIT_IF(eval_breaker & _PY_EVAL_EVENTS_MASK);`
`4236`		`- EXIT_IF(eval_breaker == FT_ATOMIC_LOAD_UINTPTR_ACQUIRE(_PyFrame_GetCode(frame)->_co_instrumentation_version));`
	`4236`	`+ assert(eval_breaker == FT_ATOMIC_LOAD_UINTPTR_ACQUIRE(_PyFrame_GetCode(frame)->_co_instrumentation_version));`
`4237`	`4237`	`}`
`4238`	`4238`
`4239`	`4239`	`tier2 op(_EVAL_BREAKER_EXIT, (--)) {`