Change BUILD_INTERPOLATION opcode to simplify

Author: lysnikolaou

Include/internal/pycore_interpolation.h

@@ -19,7 +19,7 @@ typedef struct {
 
 extern PyTypeObject PyInterpolation_Type;
 
-PyAPI_FUNC(PyObject *) _PyInterpolation_FromStackRefSteal(_PyStackRef *values, Py_ssize_t n);
+PyAPI_FUNC(PyObject *) _PyInterpolation_FromStackRefSteal(_PyStackRef *values);
 
 extern PyStatus _PyInterpolation_InitTypes(PyInterpreterState *);
 extern void _PyInterpolation_FiniTypes(PyInterpreterState *);

Include/internal/pycore_opcode_metadata.h

@@ -95,32 +95,21 @@ _PyInterpolation_FiniTypes(PyInterpreterState *interp)
 }
 
 PyObject *
-_PyInterpolation_FromStackRefSteal(_PyStackRef *values, Py_ssize_t oparg)
+_PyInterpolation_FromStackRefSteal(_PyStackRef *values)
 {
-    Py_ssize_t index = 2;
-
-    PyObject *args = PyTuple_New(oparg + ((oparg >> 1) & 1) + (oparg & 1));
+    PyObject *args = PyTuple_New(4);
     if (!args) {
         goto error;
     }
 
     PyTuple_SET_ITEM(args, 0, PyStackRef_AsPyObjectSteal(values[0]));
     PyTuple_SET_ITEM(args, 1, PyStackRef_AsPyObjectSteal(values[1]));
 
-    if ((oparg >> 1) & 1) {
-        PyTuple_SET_ITEM(args, 2, PyStackRef_AsPyObjectSteal(values[index]));
-        index++;
-    }
-    else {
-        PyTuple_SET_ITEM(args, 2, Py_NewRef(Py_None));
-    }
+    PyObject *conv = PyStackRef_AsPyObjectSteal(values[2]);
+    PyTuple_SET_ITEM(args, 2, conv ? conv : Py_NewRef(Py_None));
 
-    if (oparg & 1) {
-        PyTuple_SET_ITEM(args, 3, PyStackRef_AsPyObjectSteal(values[index]));
-    }
-    else {
-        PyTuple_SET_ITEM(args, 3, &_Py_STR(empty));
-    }
+    PyObject *format_spec = PyStackRef_AsPyObjectSteal(values[3]);
+    PyTuple_SET_ITEM(args, 3, format_spec ? format_spec : &_Py_STR(empty));
 
     PyObject *interpolation = PyObject_CallObject((PyObject *) &PyInterpolation_Type, args);
     if (!interpolation) {
@@ -132,13 +121,7 @@ _PyInterpolation_FromStackRefSteal(_PyStackRef *values, Py_ssize_t oparg)
 error:
     PyStackRef_CLOSE(values[0]);
     PyStackRef_CLOSE(values[1]);
-    index = 2;
-    if ((oparg >> 1) & 1) {
-        PyStackRef_XCLOSE(values[index]);
-        index++;
-    }
-    if (oparg & 1) {
-        PyStackRef_XCLOSE(values[index]);
-    }
+    PyStackRef_XCLOSE(values[2]);
+    PyStackRef_XCLOSE(values[3]);
     return NULL;
 }

Include/internal/pycore_uop_metadata.h

@@ -1491,7 +1491,7 @@ expr_ty _PyPegen_interpolation(Parser *p, expr_ty expression, Token *debug, Resu
     int conversion_val = _get_interpolation_conversion(p, debug, conversion, format);
     if (conversion_val >= 0) {
         expr_ty conv = (expr_ty) conversion->result;
-        convstr = PyUnicode_FromObject(conv->v.Name.id);
+        convstr = _PyUnicode_Copy(conv->v.Name.id);
         if (convstr == NULL) {
             return NULL;
         }

Include/opcode_ids.h

@@ -1726,8 +1726,8 @@ dummy_func(
             str = PyStackRef_FromPyObjectSteal(str_o);
         }
 
-        inst(BUILD_INTERPOLATION, (values[2 + ((oparg >> 1) & 1) + (oparg & 1)] -- interpolation)) {
-            PyObject *interpolation_o = _PyInterpolation_FromStackRefSteal(values, oparg);
+        inst(BUILD_INTERPOLATION, (values[4] -- interpolation)) {
+            PyObject *interpolation_o = _PyInterpolation_FromStackRefSteal(values);
             ERROR_IF(interpolation_o == NULL, error);
             interpolation = PyStackRef_FromPyObjectSteal(interpolation_o);
         }

Lib/_opcode_metadata.py

@@ -3912,20 +3912,26 @@ codegen_interpolation(compiler *c, expr_ty e)
        - (oparg >> 1) & 1 == 1, if conversion is not NULL
        - oparg & 1 == 1, if format_spec is not NULL
     */
-    int oparg = 0b100;
     location loc = LOC(e);
 
     VISIT(c, expr, e->v.Interpolation.value);
     ADDOP_LOAD_CONST(c, loc, e->v.Interpolation.str);
+
     if (e->v.Interpolation.conversion) {
         ADDOP_LOAD_CONST(c, loc, e->v.Interpolation.conversion);
-        oparg |= 0b10;
     }
+    else {
+        ADDOP(c, loc, PUSH_NULL);
+    }
+
     if (e->v.Interpolation.format_spec) {
         VISIT(c, expr, e->v.Interpolation.format_spec);
-        oparg |= 1;
     }
-    ADDOP_I(c, loc, BUILD_INTERPOLATION, oparg);
+    else {
+        ADDOP(c, loc, PUSH_NULL);
+    }
+
+    ADDOP(c, loc, BUILD_INTERPOLATION);
     return SUCCESS;
 }