Merge branch 'main' into jumps-to-deopts

python · markshannon · Nov 15, 2023 · Nov 5, 2023 · Nov 11, 2023 · Nov 11, 2023
commit 2de345197e62b29b71c19644d0ec1c48cfe3b667
diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -4007,19 +4007,12 @@ dummy_func(
         }
 
         op (_GUARD_IS_NONE_POP, (val -- )) {
-            if (!Py_IsNone(val)) {
-                Py_DECREF(val);
-                DEOPT_IF(true);
-            }
+            DEOPT_IF(!Py_IsNone(val));
         }
 
         op (_GUARD_IS_NOT_NONE_POP, (val -- )) {
-            if (Py_IsNone(val)) {
-                DEOPT_IF(true);
-            }
-            else {
-                Py_DECREF(val);
-            }
+            DEOPT_IF(Py_IsNone(val));
+            Py_DECREF(val);
         }
 
         op(_JUMP_TO_TOP, (--)) {

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