Merge remote-tracking branch 'upstream/main' into stackref_all

Fidget-Spinner · Jun 26, 2024 · Apr 30, 2024 · Apr 30, 2024 · Apr 30, 2024 · Apr 30, 2024
commit b33d161fb5bb7d8ad728bbaff8b91066cbc2d5bb
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -3102,86 +3102,22 @@ dummy_func(
             _FOR_ITER_GEN_FRAME +
             _PUSH_FRAME;
 
-        inst(BEFORE_ASYNC_WITH, (mgr -- exit, res)) {
-            PyObject *exit_o;
-            PyObject *mgr_o = PyStackRef_AsPyObjectBorrow(mgr);
-            PyObject *res_o;
-
-            PyObject *enter = _PyObject_LookupSpecial(mgr_o, &_Py_ID(__aenter__));
-            if (enter == NULL) {
-                if (!_PyErr_Occurred(tstate)) {
-                    _PyErr_Format(tstate, PyExc_TypeError,
-                                  "'%.200s' object does not support the "
-                                  "asynchronous context manager protocol",
-                                  Py_TYPE(mgr_o)->tp_name);
-                }
-                ERROR_NO_POP();
-            }
-            exit_o = _PyObject_LookupSpecial(mgr_o, &_Py_ID(__aexit__));
-            if (exit_o == NULL) {
-                if (!_PyErr_Occurred(tstate)) {
-                    _PyErr_Format(tstate, PyExc_TypeError,
-                                  "'%.200s' object does not support the "
-                                  "asynchronous context manager protocol "
-                                  "(missed __aexit__ method)",
-                                  Py_TYPE(mgr_o)->tp_name);
-                }
-                Py_DECREF(enter);
-                ERROR_NO_POP();
-            }
-
-            DECREF_INPUTS();
-            res_o = PyObject_CallNoArgs(enter);
-            Py_DECREF(enter);
-            if (res_o == NULL) {
-                Py_DECREF(exit_o);
-                ERROR_IF(true, error);
-            }
-            exit = PyStackRef_FromPyObjectSteal(exit_o);
-            res = PyStackRef_FromPyObjectSteal(res_o);
-        }
-
-        inst(BEFORE_WITH, (mgr -- exit, res)) {
-            PyObject *exit_o;
-            PyObject *mgr_o = PyStackRef_AsPyObjectBorrow(mgr);
-            PyObject *res_o;
-            /* pop the context manager, push its __exit__ and the
-             * value returned from calling its __enter__
-             */
-            PyObject *enter = _PyObject_LookupSpecial(mgr_o, &_Py_ID(__enter__));
-            if (enter == NULL) {
+        inst(LOAD_SPECIAL, (owner -- attr, self_or_null)) {
+            assert(oparg <= SPECIAL_MAX);
+            PyGenObject *owner_o = (PyGenObject *)PyStackRef_AsPyObjectSteal(owner_o);
+            PyObject *name = _Py_SpecialMethods[oparg].name;
+            attr = PyStackRef_FromPyObjectSteal(_PyObject_LookupSpecialMethod(owner_o, name, &self_or_null));
+            if (PyStackRef_IsNull(attr)) {
                 if (!_PyErr_Occurred(tstate)) {
                     _PyErr_Format(tstate, PyExc_TypeError,
-                                  "'%.200s' object does not support the "
-                                  "context manager protocol",
-                                  Py_TYPE(mgr_o)->tp_name);
+                                  _Py_SpecialMethods[oparg].error,
+                                  Py_TYPE(owner_o)->tp_name);
                 }
-                ERROR_NO_POP();
             }
-            exit_o = _PyObject_LookupSpecial(mgr_o, &_Py_ID(__exit__));
-            if (exit_o == NULL) {
-                if (!_PyErr_Occurred(tstate)) {
-                    _PyErr_Format(tstate, PyExc_TypeError,
-                                  "'%.200s' object does not support the "
-                                  "context manager protocol "
-                                  "(missed __exit__ method)",
-                                  Py_TYPE(mgr_o)->tp_name);
-                }
-                Py_DECREF(enter);
-                ERROR_NO_POP();
-            }
-            DECREF_INPUTS();
-            res_o = PyObject_CallNoArgs(enter);
-            Py_DECREF(enter);
-            if (res_o == NULL) {
-                Py_DECREF(exit_o);
-                ERROR_IF(true, error);
-            }
-            exit = PyStackRef_FromPyObjectSteal(exit_o);
-            res = PyStackRef_FromPyObjectSteal(res_o);
+            ERROR_IF(PyStackRef_IsNull(attr), error);
         }
 
-        inst(WITH_EXCEPT_START, (exit_func, lasti, unused, val -- exit_func, lasti, unused, val, res)) {
+        inst(WITH_EXCEPT_START, (exit_func, exit_self, lasti, unused, val -- exit_func, exit_self, lasti, unused, val, res)) {
             /* At the top of the stack are 4 values:
                - val: TOP = exc_info()
                - unused: SECOND = previous exception
@@ -3207,10 +3143,10 @@ dummy_func(
             }
             assert(PyLong_Check(PyStackRef_AsPyObjectBorrow(lasti)));
             (void)lasti; // Shut up compiler warning if asserts are off
-            PyObject * stack[4] = {NULL, exc, val_o, tb};
-            res = PyStackRef_FromPyObjectSteal(
-                PyObject_Vectorcall(exit_func_o, stack + 1,
-                    3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL));
+            PyObject *stack[5] = {NULL, PyStackRef_AsPyObjectBorrow(exit_self), exc, val, tb};
+            int has_self = !PyStackRef_IsNull(exit_self);
+            res = PyStackRef_FromPyObjectSteal(PyObject_Vectorcall(exit_func, stack + 2 - has_self,
+                    (3 + has_self) | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL));
             ERROR_IF(PyStackRef_IsNull(res), error);
         }
 

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