https-github-com-nzysoft
diff --git a/‎Misc/NEWS.d/next/Core and Builtins/2023-08-10-00-00-48.gh-issue-106581.o7zDty.rst‎
Lines changed: 2 additions & 0 deletions b/‎Misc/NEWS.d/next/Core and Builtins/2023-08-10-00-00-48.gh-issue-106581.o7zDty.rst‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎Python/bytecodes.c‎
Lines changed: 6 additions & 4 deletions b/‎Python/bytecodes.c‎
Lines changed: 6 additions & 4 deletions
diff --git a/‎Python/executor_cases.c.h‎
Lines changed: 6 additions & 4 deletions b/‎Python/executor_cases.c.h‎
Lines changed: 6 additions & 4 deletions
diff --git a/‎Python/generated_cases.c.h‎
Lines changed: 6 additions & 4 deletions b/‎Python/generated_cases.c.h‎
Lines changed: 6 additions & 4 deletions
@@ -0,0 +1,2 @@
+Fix possible assertion failures and missing instrumentation events when
+:envvar:`PYTHONUOPS` or :option:`-X uops <-X>` is enabled.
@@ -133,17 +133,19 @@ dummy_func(
         }
 
         inst(RESUME, (--)) {
-            #if TIER_ONE
             assert(frame == tstate->current_frame);
             /* Possibly combine this with eval breaker */
             if (_PyFrame_GetCode(frame)->_co_instrumentation_version != tstate->interp->monitoring_version) {
                 int err = _Py_Instrument(_PyFrame_GetCode(frame), tstate->interp);
                 ERROR_IF(err, error);
+                #if TIER_ONE
                 next_instr--;
+                #endif
+                #if TIER_TWO
+                goto deoptimize;
+                #endif
             }
-            else
-            #endif
-            if (oparg < 2) {
+            else if (oparg < 2) {
                 CHECK_EVAL_BREAKER();
             }
         }
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix possible assertion failures and missing instrumentation events when`
	`2`	+:envvar:`PYTHONUOPS` or :option:`-X uops <-X>` is enabled.
Original file line number	Diff line number	Diff line change
`@@ -133,17 +133,19 @@ dummy_func(`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`inst(RESUME, (--)) {`
`136`		`- #if TIER_ONE`
`137`	`136`	`assert(frame == tstate->current_frame);`
`138`	`137`	`/* Possibly combine this with eval breaker */`
`139`	`138`	`if (_PyFrame_GetCode(frame)->_co_instrumentation_version != tstate->interp->monitoring_version) {`
`140`	`139`	`int err = _Py_Instrument(_PyFrame_GetCode(frame), tstate->interp);`
`141`	`140`	`ERROR_IF(err, error);`
	`141`	`+ #if TIER_ONE`
`142`	`142`	`next_instr--;`
	`143`	`+ #endif`
	`144`	`+ #if TIER_TWO`
	`145`	`+ goto deoptimize;`
	`146`	`+ #endif`
`143`	`147`	`}`
`144`		`- else`
`145`		`- #endif`
`146`		`- if (oparg < 2) {`
	`148`	`+ else if (oparg < 2) {`
`147`	`149`	`CHECK_EVAL_BREAKER();`
`148`	`150`	`}`
`149`	`151`	`}`