Fix tests

gvanrossum · gvanrossum · commit 79036ff35934 · 2024-03-26T13:37:42.000-07:00
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -2348,7 +2348,7 @@ dummy_func(
             JUMPBY(-oparg);
             #if ENABLE_SPECIALIZATION
             uint16_t counter = this_instr[1].cache;
-            if (ADAPTIVE_COUNTER_IS_ZERO(counter) && this_instr->op.code == JUMP_BACKWARD) {
+            if (ADAPTIVE_COUNTER_IS_ZERO(counter)) {
                 if (counter == 0) {
                     // Dynamically initialize the counter
                     PyInterpreterState *interp = tstate->interp;
@@ -2358,7 +2358,7 @@ dummy_func(
                         this_instr[1].cache = counter;
                     }
                 }
-                else {
+                if (ADAPTIVE_COUNTER_IS_ZERO(counter) && this_instr->op.code == JUMP_BACKWARD) {
                     _Py_CODEUNIT *start = this_instr;
                     /* Back up over EXTENDED_ARGs so optimizer sees the whole instruction */
                     while (oparg > 255) {
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
diff --git a/Python/optimizer.c b/Python/optimizer.c
@@ -136,7 +136,7 @@ shift_and_offset_threshold(uint32_t threshold)
     if (threshold == OPTIMIZER_UNREACHABLE_THRESHOLD) {
         return threshold;
     }
-    return adaptive_counter_bits(threshold - 1, MIN_TIER2_BACKOFF);
+    return adaptive_counter_bits(threshold, MIN_TIER2_BACKOFF);
 }
 
 _PyOptimizerObject *

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ shift_and_offset_threshold(uint32_t threshold)`
`136`	`136`	`if (threshold == OPTIMIZER_UNREACHABLE_THRESHOLD) {`
`137`	`137`	`return threshold;`
`138`	`138`	`}`
`139`		`- return adaptive_counter_bits(threshold - 1, MIN_TIER2_BACKOFF);`
	`139`	`+ return adaptive_counter_bits(threshold, MIN_TIER2_BACKOFF);`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`_PyOptimizerObject *`