add CONSTANT_BUILTIN_ALL/ANY/TUPLE oparg for LOAD_COMMON_CONST

python · iritkatriel · Mar 28, 2025 · Mar 20, 2025 · Mar 22, 2025 · Mar 25, 2025
commit 8de72765c7953d81ee1ee157fd6f757a2f37ce50
diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h
diff --git a/Include/internal/pycore_opcode_utils.h b/Include/internal/pycore_opcode_utils.h
@@ -67,7 +67,10 @@ extern "C" {
 /* Values used as the oparg for LOAD_COMMON_CONSTANT */
 #define CONSTANT_ASSERTIONERROR 0
 #define CONSTANT_NOTIMPLEMENTEDERROR 1
-#define NUM_COMMON_CONSTANTS 2
+#define CONSTANT_BUILTIN_TUPLE 2
+#define CONSTANT_BUILTIN_ALL 3
+#define CONSTANT_BUILTIN_ANY 4
+#define NUM_COMMON_CONSTANTS 5
 
 /* Values used in the oparg for RESUME */
 #define RESUME_AT_FUNC_START 0

diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h
diff --git a/Lib/opcode.py b/Lib/opcode.py
@@ -9,6 +9,7 @@
            "HAVE_ARGUMENT", "EXTENDED_ARG", "hasarg", "hasconst", "hasname",
            "hasjump", "hasjrel", "hasjabs", "hasfree", "haslocal", "hasexc"]
 
+import builtins
 import _opcode
 from _opcode import stack_effect
 
@@ -38,7 +39,8 @@
 _intrinsic_1_descs = _opcode.get_intrinsic1_descs()
 _intrinsic_2_descs = _opcode.get_intrinsic2_descs()
 _special_method_names = _opcode.get_special_method_names()
-_common_constants = [AssertionError, NotImplementedError]
+_common_constants = [AssertionError, NotImplementedError,
+                     builtins.tuple, builtins.all, builtins.any]
 _nb_ops = _opcode.get_nb_ops()
 
 hascompare = [opmap["COMPARE_OP"]]

@@ -1409,10 +1409,21 @@ dummy_func(
             if (oparg == CONSTANT_ASSERTIONERROR) {
                 val = PyExc_AssertionError;
             }
-            else {
-                assert(oparg == CONSTANT_NOTIMPLEMENTEDERROR);
+            else if (oparg == CONSTANT_NOTIMPLEMENTEDERROR) {
                 val = PyExc_NotImplementedError;
             }
+            else if (oparg == CONSTANT_BUILTIN_TUPLE) {
+                val = (PyObject*)&PyTuple_Type;
+            }
+            else if (oparg == CONSTANT_BUILTIN_ALL) {
+                val = PyDict_GetItemWithError(builtins_dict, &_Py_ID(all));
+            }
+            else if (oparg == CONSTANT_BUILTIN_ANY) {
+                val = PyDict_GetItemWithError(builtins_dict, &_Py_ID(any));
+            }
+            else {
+                Py_UNREACHABLE();
+            }
             value = PyStackRef_FromPyObjectImmortal(val);
         }
 

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