python · colesbury · Aug 12, 2024 · Aug 8, 2024
diff --git a/Include/internal/pycore_list.h b/Include/internal/pycore_list.h
@@ -56,7 +56,10 @@ typedef struct {
    PyListObject *it_seq; /* Set to NULL when iterator is exhausted */
 } _PyListIterObject;

-PyAPI_FUNC(PyObject *)_PyList_FromArraySteal(PyObject *const *src, Py_ssize_t n);
+union _PyStackRef;
+
+PyAPI_FUNC(PyObject *)_PyList_FromStackRefSteal(const union _PyStackRef *src, Py_ssize_t n);
+

 #ifdef __cplusplus
 }

diff --git a/Objects/listobject.c b/Objects/listobject.c
@@ -3142,7 +3142,7 @@ PyList_AsTuple(PyObject *v)
 }

 PyObject *
-_PyList_FromArraySteal(PyObject *const *src, Py_ssize_t n)
+_PyList_FromStackRefSteal(const _PyStackRef *src, Py_ssize_t n)
 {
    if (n == 0) {
        return PyList_New(0);
@@ -3151,13 +3151,15 @@ _PyList_FromArraySteal(PyObject *const *src, Py_ssize_t n)
    PyListObject *list = (PyListObject *)PyList_New(n);
    if (list == NULL) {
        for (Py_ssize_t i = 0; i < n; i++) {
-            Py_DECREF(src[i]);
+            PyStackRef_CLOSE(src[i]);
        }
        return NULL;
    }

    PyObject **dst = list->ob_item;
-    memcpy(dst, src, n * sizeof(PyObject *));
+    for (Py_ssize_t i = 0; i < n; i++) {
+        dst[i] = PyStackRef_AsPyObjectSteal(src[i]);
+    }

    return (PyObject *)list;
 }

@@ -1666,13 +1666,7 @@ dummy_func(
        }

        inst(BUILD_LIST, (values[oparg] -- list)) {
-            STACKREFS_TO_PYOBJECTS(values, oparg, values_o);
-            if (CONVERSION_FAILED(values_o)) {
-                DECREF_INPUTS();
-                ERROR_IF(true, error);
-            }
-            PyObject *list_o = _PyList_FromArraySteal(values_o, oparg);
-            STACKREFS_TO_PYOBJECTS_CLEANUP(values_o);
+            PyObject *list_o = _PyList_FromStackRefSteal(values, oparg);
            ERROR_IF(list_o == NULL, error);
            list = PyStackRef_FromPyObjectSteal(list_o);
        }

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
@@ -534,7 +534,7 @@ def has_error_without_pop(op: parser.InstDef) -> bool:
    "STACKREFS_TO_PYOBJECTS",
    "STACKREFS_TO_PYOBJECTS_CLEANUP",
    "CONVERSION_FAILED",
-    "_PyList_FromArraySteal",
+    "_PyList_FromStackRefSteal",
    "_PyTuple_FromArraySteal",
    "_PyTuple_FromStackRefSteal",
 )