Fix various stuff in the VM

Author: lysnikolaou

Include/internal/pycore_interpolation.h

@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject _PyInterpolation_Type;
 
-PyAPI_FUNC(PyObject *) _PyInterpolation_FromStackRefSteal(_PyStackRef *values);
+PyAPI_FUNC(PyObject *) _PyInterpolation_FromStackRefStealOnSuccess(_PyStackRef *values);
 
 extern PyStatus _PyInterpolation_InitTypes(PyInterpreterState *interp);
 extern PyObject *_PyInterpolation_GetValue(PyObject *interpolation);

Include/internal/pycore_opcode_metadata.h

@@ -17,7 +17,7 @@ extern PyTypeObject _PyTemplateIter_Type;
 extern PyObject *_PyTemplate_Concat(PyObject *self, PyObject *other);
 
 PyAPI_FUNC(PyObject *) _PyTemplate_FromValues(PyObject **values, Py_ssize_t n);
-PyAPI_FUNC(PyObject *) _PyTemplate_FromListStackRef(_PyStackRef ref);
+PyAPI_FUNC(PyObject *) _PyTemplate_FromList(PyObject *list);
 
 #ifdef __cplusplus
 }

Include/internal/pycore_template.h

@@ -225,37 +225,29 @@ _PyInterpolation_InitTypes(PyInterpreterState *interp)
 }
 
 PyObject *
-_PyInterpolation_FromStackRefSteal(_PyStackRef *values)
+_PyInterpolation_FromStackRefStealOnSuccess(_PyStackRef *values)
 {
-    PyObject *args = PyTuple_New(4);
-    if (!args) {
-        PyStackRef_CLOSE(values[0]);
-        PyStackRef_CLOSE(values[1]);
-        PyStackRef_XCLOSE(values[2]);
-        PyStackRef_XCLOSE(values[3]);
+    interpolationobject *interpolation = (interpolationobject *) _PyInterpolation_Type.tp_alloc(&_PyInterpolation_Type, 0);
+    if (!interpolation) {
         return NULL;
     }
 
-    PyTuple_SET_ITEM(args, 0, PyStackRef_AsPyObjectSteal(values[0]));
-    PyTuple_SET_ITEM(args, 1, PyStackRef_AsPyObjectSteal(values[1]));
+    interpolation->value = PyStackRef_AsPyObjectSteal(values[0]);
+    interpolation->expression = PyStackRef_AsPyObjectSteal(values[1]);
 
     if (PyStackRef_IsNull(values[2])) {
-        PyTuple_SET_ITEM(args, 2, Py_NewRef(Py_None));
+        interpolation->conversion = Py_NewRef(Py_None);
     } else {
-        PyObject *conversion = PyStackRef_AsPyObjectSteal(values[2]);
-        PyTuple_SET_ITEM(args, 2, conversion);
+        interpolation->conversion = PyStackRef_AsPyObjectSteal(values[2]);
     }
 
     if (PyStackRef_IsNull(values[3])) {
-        PyTuple_SET_ITEM(args, 3, &_Py_STR(empty));
+        interpolation->format_spec = Py_NewRef(&_Py_STR(empty));
     } else {
-        PyObject *format_spec = PyStackRef_AsPyObjectSteal(values[3]);
-        PyTuple_SET_ITEM(args, 3, format_spec);
+        interpolation->format_spec = PyStackRef_AsPyObjectSteal(values[3]);
     }
 
-    PyObject *interpolation = PyObject_CallObject((PyObject *) &_PyInterpolation_Type, args);
-    Py_DECREF(args);
-    return interpolation;
+    return (PyObject *) interpolation;
 }
 
 PyObject *

Include/internal/pycore_uop_metadata.h

@@ -484,23 +484,20 @@ _PyTemplate_FromValues(PyObject **values, Py_ssize_t oparg)
         PyTuple_SET_ITEM(tuple, i, Py_NewRef(values[i]));
     }
 
-    PyObject *template = PyObject_CallObject((PyObject *) &_PyTemplate_Type, tuple);
+    PyObject *template = (PyObject *) template_new(&_PyTemplate_Type, tuple, NULL);
     Py_DECREF(tuple);
     return template;
 }
 
 PyObject *
-_PyTemplate_FromListStackRef(_PyStackRef ref)
+_PyTemplate_FromList(PyObject *list)
 {
-    PyObject *list = PyStackRef_AsPyObjectSteal(ref);
-
-    PyObject *tuple = PySequence_Tuple(list);
+    PyObject *tuple = PyList_AsTuple(list);
     if (!tuple) {
-        PyStackRef_CLOSE(ref);
         return NULL;
     }
 
-    PyObject *template = PyObject_CallObject((PyObject *) &_PyTemplate_Type, tuple);
+    PyObject *template = (PyObject *) template_new(&_PyTemplate_Type, tuple, NULL);
     Py_DECREF(tuple);
     return template;
 }

Objects/interpolationobject.c

@@ -1872,9 +1872,11 @@ dummy_func(
         }
 
         inst(BUILD_INTERPOLATION, (values[4] -- interpolation)) {
-            PyObject *interpolation_o = _PyInterpolation_FromStackRefSteal(values);
+            PyObject *interpolation_o = _PyInterpolation_FromStackRefStealOnSuccess(values);
+            if (interpolation_o == NULL) {
+                ERROR_NO_POP();
+            }
             INPUTS_DEAD();
-            ERROR_IF(interpolation_o == NULL, error);
             interpolation = PyStackRef_FromPyObjectSteal(interpolation_o);
         }
 
@@ -1892,8 +1894,9 @@ dummy_func(
         }
 
         inst(BUILD_TEMPLATE_LIST, (list -- template)) {
-            PyObject *template_o = _PyTemplate_FromListStackRef(list);
-            INPUTS_DEAD();
+            PyObject *list_o = PyStackRef_AsPyObjectBorrow(list);
+            PyObject *template_o = _PyTemplate_FromList(list_o);
+            PyStackRef_CLOSE(list);
             ERROR_IF(template_o == NULL, error);
             template = PyStackRef_FromPyObjectSteal(template_o);
         }

Objects/templateobject.c

@@ -630,7 +630,7 @@ def has_error_without_pop(op: parser.CodeDef) -> bool:
     "_PyFrame_StackPush",
     "_PyFunction_SetVersion",
     "_PyGen_GetGeneratorFromFrame",
-    "_PyInterpolation_FromStackRefSteal",
+    "_PyInterpolation_FromStackRefStealOnSuccess",
     "_PyInterpreterState_GET",
     "_PyList_AppendTakeRef",
     "_PyList_ITEMS",
@@ -649,8 +649,7 @@ def has_error_without_pop(op: parser.CodeDef) -> bool:
     "_PyObject_InlineValues",
     "_PyObject_IsUniquelyReferenced",
     "_PyObject_ManagedDictPointer",
-    "_PyTemplate_FromValues",
-    "_PyTemplate_FromListStackRef",
+    "_PyTemplate_FromList",
     "_PyThreadState_HasStackSpace",
     "_PyTuple_FromStackRefStealOnSuccess",
     "_PyTuple_ITEMS",