PEP 505!!! (fix augmented assignments)

thatbirdguythatuknownot · Oct 20, 2023 · 6eff0fd · 6eff0fd
1 parent 8d09d4a
commit 6eff0fd
Show file tree

Hide file tree

Showing 12 changed files with 328 additions and 85 deletions.
diff --git a/Include/internal/pycore_opcode.h b/Include/internal/pycore_opcode.h
diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h
diff --git a/Include/opcode_ids.h b/Include/opcode_ids.h
diff --git a/Lib/opcode.py b/Lib/opcode.py
@@ -155,9 +155,6 @@ def def_op(name, op):
 def_op('RESUME', 151)   # This must be kept in sync with deepfreeze.py
 def_op('MATCH_CLASS', 152)
 
-def_op('POP_POPJUMP_IF_NONE', 153)
-def_op('POP_POP2JUMP_IF_NONE', 154)
-
 def_op('BUILD_CONST_KEY_MAP', 156)
 def_op('BUILD_STRING', 157)
 def_op('CONVERT_VALUE', 158)
@@ -180,6 +177,11 @@ def def_op(name, op):
 def_op('LOAD_FROM_DICT_OR_DEREF', 176)
 def_op('SET_FUNCTION_ATTRIBUTE', 177)    # Attribute
 
+def_op('POP_POPJUMP_IF_NONE', 180)
+def_op('POP_POP2JUMP_IF_NONE', 181)
+def_op('POP_POP3JUMP_IF_NONE', 182)
+def_op('POP_POP4JUMP_IF_NONE', 183)
+
 # Optimizer hook
 def_op('ENTER_EXECUTOR', 230)
 

diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -2288,19 +2288,10 @@ dummy_func(
             JUMPBY(oparg * Py_IsTrue(cond));
         }
 
-        op(POP_POPJUMP_IF_TRUE, (unused if (jump), cond -- )) {
+        op(POP_IF_TRUE, (unused if (jump), cond -- cond)) {
             assert(PyBool_Check(cond));
             if (Py_IsTrue(cond)) {
-                STACK_SHRINK(2);
-                JUMPBY(oparg);
-            }
-        }
-
-        op(POP_POP2JUMP_IF_TRUE, (unused if (jump), unused if (jump), cond -- )) {
-            assert(PyBool_Check(cond));
-            if (Py_IsTrue(cond)) {
-                STACK_SHRINK(2);
-                JUMPBY(oparg);
+                STACK_SHRINK(1);
             }
         }
 
@@ -2316,9 +2307,17 @@ dummy_func(
 
         macro(POP_JUMP_IF_NONE) = IS_NONE + POP_JUMP_IF_TRUE;
 
-        macro(POP_POPJUMP_IF_NONE) = IS_NONE + POP_POPJUMP_IF_TRUE;
+        macro(POP_POPJUMP_IF_NONE) =
+            IS_NONE + POP_IF_TRUE + POP_JUMP_IF_TRUE;
+
+        macro(POP_POP2JUMP_IF_NONE)
+            = IS_NONE + POP_IF_TRUE + POP_IF_TRUE + POP_JUMP_IF_TRUE;
+
+        macro(POP_POP3JUMP_IF_NONE)
+            = IS_NONE + POP_IF_TRUE + POP_IF_TRUE + POP_IF_TRUE + POP_JUMP_IF_TRUE;
 
-        macro(POP_POP2JUMP_IF_NONE) = IS_NONE + POP_POP2JUMP_IF_TRUE;
+        macro(POP_POP4JUMP_IF_NONE)
+            = IS_NONE + POP_IF_TRUE + POP_IF_TRUE + POP_IF_TRUE + POP_IF_TRUE + POP_JUMP_IF_TRUE;
 
         macro(POP_JUMP_IF_NOT_NONE) = IS_NONE + POP_JUMP_IF_FALSE;