reduce duplication in new opcodes

Author: eendebakpt

Python/bytecodes.c

@@ -793,46 +793,23 @@ dummy_func(
         // assignment (+=) on ob_fval, which generates problematic JIT
         // stencils on i686-pc-windows-msvc.
         tier2 op(_BINARY_OP_ADD_FLOAT_INPLACE, (left, right -- res, l, r)) {
-            PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
-            PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
-            assert(PyFloat_CheckExact(left_o));
-            assert(PyFloat_CheckExact(right_o));
-            assert(_PyObject_IsUniquelyReferenced(left_o));
-            STAT_INC(BINARY_OP, hit);
-            double dres = ((PyFloatObject *)left_o)->ob_fval + ((PyFloatObject *)right_o)->ob_fval;
-            ((PyFloatObject *)left_o)->ob_fval = dres;
-            // Transfer ownership of left to res.
-            // Original left is now dead.
+            FLOAT_INPLACE_OP(left, right, left, +);
             res = left;
             l = PyStackRef_NULL;
             r = right;
             INPUTS_DEAD();
         }
 
         tier2 op(_BINARY_OP_SUBTRACT_FLOAT_INPLACE, (left, right -- res, l, r)) {
-            PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
-            PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
-            assert(PyFloat_CheckExact(left_o));
-            assert(PyFloat_CheckExact(right_o));
-            assert(_PyObject_IsUniquelyReferenced(left_o));
-            STAT_INC(BINARY_OP, hit);
-            double dres = ((PyFloatObject *)left_o)->ob_fval - ((PyFloatObject *)right_o)->ob_fval;
-            ((PyFloatObject *)left_o)->ob_fval = dres;
+            FLOAT_INPLACE_OP(left, right, left, -);
             res = left;
             l = PyStackRef_NULL;
             r = right;
             INPUTS_DEAD();
         }
 
         tier2 op(_BINARY_OP_MULTIPLY_FLOAT_INPLACE, (left, right -- res, l, r)) {
-            PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
-            PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
-            assert(PyFloat_CheckExact(left_o));
-            assert(PyFloat_CheckExact(right_o));
-            assert(_PyObject_IsUniquelyReferenced(left_o));
-            STAT_INC(BINARY_OP, hit);
-            double dres = ((PyFloatObject *)left_o)->ob_fval * ((PyFloatObject *)right_o)->ob_fval;
-            ((PyFloatObject *)left_o)->ob_fval = dres;
+            FLOAT_INPLACE_OP(left, right, left, *);
             res = left;
             l = PyStackRef_NULL;
             r = right;
@@ -841,44 +818,23 @@ dummy_func(
 
         // Inplace RIGHT variants: mutate the uniquely-referenced right operand.
         tier2 op(_BINARY_OP_ADD_FLOAT_INPLACE_RIGHT, (left, right -- res, l, r)) {
-            PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
-            PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
-            assert(PyFloat_CheckExact(left_o));
-            assert(PyFloat_CheckExact(right_o));
-            assert(_PyObject_IsUniquelyReferenced(right_o));
-            STAT_INC(BINARY_OP, hit);
-            double dres = ((PyFloatObject *)left_o)->ob_fval + ((PyFloatObject *)right_o)->ob_fval;
-            ((PyFloatObject *)right_o)->ob_fval = dres;
+            FLOAT_INPLACE_OP(left, right, right, +);
             res = right;
             l = left;
             r = PyStackRef_NULL;
             INPUTS_DEAD();
         }
 
         tier2 op(_BINARY_OP_MULTIPLY_FLOAT_INPLACE_RIGHT, (left, right -- res, l, r)) {
-            PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
-            PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
-            assert(PyFloat_CheckExact(left_o));
-            assert(PyFloat_CheckExact(right_o));
-            assert(_PyObject_IsUniquelyReferenced(right_o));
-            STAT_INC(BINARY_OP, hit);
-            double dres = ((PyFloatObject *)left_o)->ob_fval * ((PyFloatObject *)right_o)->ob_fval;
-            ((PyFloatObject *)right_o)->ob_fval = dres;
+            FLOAT_INPLACE_OP(left, right, right, *);
             res = right;
             l = left;
             r = PyStackRef_NULL;
             INPUTS_DEAD();
         }
 
         tier2 op(_BINARY_OP_SUBTRACT_FLOAT_INPLACE_RIGHT, (left, right -- res, l, r)) {
-            PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
-            PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
-            assert(PyFloat_CheckExact(left_o));
-            assert(PyFloat_CheckExact(right_o));
-            assert(_PyObject_IsUniquelyReferenced(right_o));
-            STAT_INC(BINARY_OP, hit);
-            double dres = ((PyFloatObject *)left_o)->ob_fval - ((PyFloatObject *)right_o)->ob_fval;
-            ((PyFloatObject *)right_o)->ob_fval = dres;
+            FLOAT_INPLACE_OP(left, right, right, -);
             res = right;
             l = left;
             r = PyStackRef_NULL;

Python/ceval_macros.h

@@ -543,3 +543,22 @@ gen_try_set_executing(PyGenObject *gen)
     }
     return false;
 }
+
+// Macro for inplace float binary ops (tier 2 only).
+// Mutates the uniquely-referenced TARGET operand in place.
+// TARGET must be either left or right.
+#define FLOAT_INPLACE_OP(left, right, TARGET, OP)                        \
+    do {                                                                 \
+        PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);            \
+        PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);          \
+        assert(PyFloat_CheckExact(left_o));                              \
+        assert(PyFloat_CheckExact(right_o));                             \
+        assert(_PyObject_IsUniquelyReferenced(                           \
+            PyStackRef_AsPyObjectBorrow(TARGET)));                       \
+        STAT_INC(BINARY_OP, hit);                                        \
+        double _dres =                                                   \
+            ((PyFloatObject *)left_o)->ob_fval                           \
+            OP ((PyFloatObject *)right_o)->ob_fval;                      \
+        ((PyFloatObject *)PyStackRef_AsPyObjectBorrow(TARGET))           \
+            ->ob_fval = _dres;                                           \
+    } while (0)