Apply Mark's and Brandt's suggestion

python · Fidget-Spinner · Apr 30, 2023 · Oct 6, 2022 · Oct 6, 2022 · Oct 6, 2022
commit 06ddc00a8f5063fde60ba0c548c4a3a69a162ec6
diff --git a/Include/internal/pycore_global_objects_fini_generated.h b/Include/internal/pycore_global_objects_fini_generated.h
diff --git a/Include/internal/pycore_global_strings.h b/Include/internal/pycore_global_strings.h
@@ -704,6 +704,7 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(x)
         STRUCT_FOR_ID(year)
         STRUCT_FOR_ID(zdict)
+        STRUCT_FOR_ID(zipimporter)
     } identifiers;
     struct {
         PyASCIIObject _ascii;

diff --git a/Include/internal/pycore_runtime_init_generated.h b/Include/internal/pycore_runtime_init_generated.h
diff --git a/Include/internal/pycore_unicodeobject_generated.h b/Include/internal/pycore_unicodeobject_generated.h
@@ -3483,40 +3483,14 @@ dummy_func(
                 int code_flags = ((PyCodeObject *)PyFunction_GET_CODE(func))->co_flags;
                 PyObject *locals = code_flags & CO_OPTIMIZED ? NULL : Py_NewRef(PyFunction_GET_GLOBALS(func));
 
-                bool has_dict = (kwargs != NULL && PyDict_GET_SIZE(kwargs) > 0);
-                PyObject *kwnames = NULL;
-                PyObject *const *newargs = has_dict
-                    ? _PyStack_UnpackDict(tstate, _PyTuple_ITEMS(callargs),
-                        nargs, kwargs, &kwnames)
-                    : &PyTuple_GET_ITEM(callargs, 0);
-                if (newargs == NULL) {
-                    goto error;
-                }
-                if (!has_dict) {
-                    /* We need to incref all our args since the new frame steals the references. */
-                    for (Py_ssize_t i = 0; i < nargs; ++i) {
-                        Py_INCREF(PyTuple_GET_ITEM(callargs, i));
-                    }
-                }
-                _PyInterpreterFrame *new_frame = _PyEvalFramePushAndInit(
-                    tstate, (PyFunctionObject *)func, locals,
-                    newargs, nargs, kwnames
-                );
+                _PyInterpreterFrame *new_frame = _PyEvalFramePushAndInit_Ex(tstate,
+                                                                            (PyFunctionObject *)func, locals,
+                                                                            nargs, callargs, kwargs);
                 STACK_SHRINK(2); /* get rid of func and NULL */
-                Py_DECREF(callargs);
-                Py_XDECREF(kwargs);
-                if (has_dict) {
-                    _PyStack_UnpackDict_FreeNoDecRef(newargs, kwnames);
-                }
                 if (new_frame == NULL) {
                     goto error;
                 }
-                _PyFrame_SetStackPointer(frame, stack_pointer);
-                frame->prev_instr = next_instr - 1;
-                new_frame->previous = frame;
-                cframe.current_frame = frame = new_frame;
-                CALL_STAT_INC(inlined_py_calls);
-                goto start_frame;
+                DISPATCH_INLINED(new_frame);
             }
             else {
                 result = do_call_core(tstate, func, callargs, kwargs, cframe.use_tracing);

@@ -217,6 +217,9 @@ static _PyInterpreterFrame *
 _PyEvalFramePushAndInit(PyThreadState *tstate, PyFunctionObject *func,
                         PyObject *locals, PyObject* const* args,
                         size_t argcount, PyObject *kwnames);
+static  _PyInterpreterFrame *
+_PyEvalFramePushAndInit_Ex(PyThreadState *tstate, PyFunctionObject *func,
+    PyObject *locals, Py_ssize_t nargs, PyObject *callargs, PyObject *kwargs);
 static void
 _PyEvalFrameClearAndPop(PyThreadState *tstate, _PyInterpreterFrame *frame);
 
@@ -2005,6 +2008,48 @@ _PyEvalFramePushAndInit(PyThreadState *tstate, PyFunctionObject *func,
     return NULL;
 }
 
+/* Same as _PyEvalFramePushAndInit but takes an args tuple and kwargs dict.
+   Steals references to func, callargs and kwargs.
+*/
+static _PyInterpreterFrame *
+_PyEvalFramePushAndInit_Ex(PyThreadState *tstate, PyFunctionObject *func,
+    PyObject *locals, Py_ssize_t nargs, PyObject *callargs, PyObject *kwargs)
+{
+    bool has_dict = (kwargs != NULL && PyDict_GET_SIZE(kwargs) > 0);
+    PyObject *kwnames = NULL;
+    PyObject *const *newargs = has_dict
+        ? _PyStack_UnpackDict(tstate, _PyTuple_ITEMS(callargs),
+            nargs, kwargs, &kwnames)
+        : &PyTuple_GET_ITEM(callargs, 0);
+    if (newargs == NULL) {
+        Py_DECREF(func);
+        goto error;
+    }
+    if (!has_dict) {
+        /* We need to incref all our args since the new frame steals the references. */
+        for (Py_ssize_t i = 0; i < nargs; ++i) {
+            Py_INCREF(PyTuple_GET_ITEM(callargs, i));
+        }
+    }
+    _PyInterpreterFrame *new_frame = _PyEvalFramePushAndInit(
+        tstate, (PyFunctionObject *)func, locals,
+        newargs, nargs, kwnames
+    );
+    if (has_dict) {
+        _PyStack_UnpackDict_FreeNoDecRef(newargs, kwnames);
+    }
+    /* No need to decref func here because the reference has been stolen by
+       _PyEvalFramePushAndInit.
+    */
+    Py_DECREF(callargs);
+    Py_XDECREF(kwargs);
+    return new_frame;
+error:
+    Py_DECREF(callargs);
+    Py_XDECREF(kwargs);
+    return NULL;
+}
+
 static void
 clear_thread_frame(PyThreadState *tstate, _PyInterpreterFrame * frame)
 {

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