use interp->callable_cache

Author: iritkatriel

Include/internal/pycore_interp_structs.h

@@ -655,6 +655,8 @@ struct _Py_unicode_state {
 struct callable_cache {
     PyObject *isinstance;
     PyObject *len;
+    PyObject *all;
+    PyObject *any;
     PyObject *list_append;
     PyObject *object__getattribute__;
 };

Include/internal/pycore_opcode_metadata.h

@@ -264,7 +264,6 @@ def f_tuple():
 
 
         # check the overriding the builtins works
-        bltin_outputs = [f() for f in funcs]
 
         global all, any, tuple
         saved = all, any, tuple
@@ -273,15 +272,26 @@ def f_tuple():
             any = lambda x : "any"
             tuple = lambda x : "tuple"
 
-            return [f() for f in funcs]
+            overridden_outputs = [f() for f in funcs]
         finally:
             all, any, tuple = saved
 
-        overridden_outputs = run_with_overrides()
+        self.assertEqual(overridden_outputs, ['all', 'any', 'tuple'])
+
+        # Now repeat, overriding the builtins module as well
+        saved = all, any, tuple
+        try:
+            builtins.all = all = lambda x : "all"
+            builtins.any = any = lambda x : "any"
+            builtins.tuple = tuple = lambda x : "tuple"
+
+            overridden_outputs = [f() for f in funcs]
+        finally:
+            all, any, tuple = saved
+            builtins.all, builtins.any, builtins.tuple = saved
+
+        self.assertEqual(overridden_outputs, ['all', 'any', 'tuple'])
 
-        for f, out1, out2 in zip(funcs, bltin_outputs, overridden_outputs):
-            with self.subTest(func = f.__name__):
-                self.assertNotEqual(out1, out2)
 
     def test_ascii(self):
         self.assertEqual(ascii(''), '\'\'')

Include/internal/pycore_uop_metadata.h

@@ -1405,26 +1405,25 @@ dummy_func(
         inst(LOAD_COMMON_CONSTANT, ( -- value)) {
             // Keep in sync with _common_constants in opcode.py
             // If we ever have more than two constants, use a lookup table
-            PyObject *val;
             if (oparg == CONSTANT_ASSERTIONERROR) {
-                val = PyExc_AssertionError;
+                value = PyStackRef_FromPyObjectImmortal(PyExc_AssertionError);
             }
             else if (oparg == CONSTANT_NOTIMPLEMENTEDERROR) {
-                val = PyExc_NotImplementedError;
+                value = PyStackRef_FromPyObjectImmortal(PyExc_NotImplementedError);
             }
             else if (oparg == CONSTANT_BUILTIN_TUPLE) {
-                val = (PyObject*)&PyTuple_Type;
+                value = PyStackRef_FromPyObjectImmortal((PyObject*)&PyTuple_Type);
             }
             else if (oparg == CONSTANT_BUILTIN_ALL) {
-                val = PyDict_GetItemWithError(BUILTINS(), &_Py_ID(all));
+                value = PyStackRef_FromPyObjectNew(tstate->interp->callable_cache.all);
             }
             else if (oparg == CONSTANT_BUILTIN_ANY) {
-                val = PyDict_GetItemWithError(BUILTINS(), &_Py_ID(any));
+                value = PyStackRef_FromPyObjectNew(tstate->interp->callable_cache.any);
             }
             else {
-                Py_UNREACHABLE();
+                _PyErr_SetString(tstate, PyExc_ValueError, "unknown common const");
+                ERROR_IF(true, error);
             }
-            value = PyStackRef_FromPyObjectNew(val);
         }
 
         inst(LOAD_BUILD_CLASS, ( -- bc)) {

Lib/test/test_builtin.py

@@ -794,6 +794,18 @@ pycore_init_builtins(PyThreadState *tstate)
     }
     interp->callable_cache.len = len;
 
+    PyObject *all = PyDict_GetItemWithError(builtins_dict, &_Py_ID(all));
+    if (!all) {
+        goto error;
+    }
+    interp->callable_cache.all = all;
+
+    PyObject *any = PyDict_GetItemWithError(builtins_dict, &_Py_ID(any));
+    if (!any) {
+        goto error;
+    }
+    interp->callable_cache.any = any;
+
     PyObject *list_append = _PyType_Lookup(&PyList_Type, &_Py_ID(append));
     if (list_append == NULL) {
         goto error;