nit

Author: corona10

Include/opcode.h

@@ -226,8 +226,7 @@ def jabs_op(name, op):
     "BINARY_ADD_UNICODE",
     "BINARY_ADD_UNICODE_INPLACE_FAST",
     "BINARY_SUBTRACT_ADAPTIVE",
-    "BINARY_SUBTRACT_INT",
-    "BINARY_SUBTRACT_FLOAT",
+    "BINARY_SUBTRACT_FAST",
     "BINARY_MULTIPLY_ADAPTIVE",
     "BINARY_MULTIPLY_INT",
     "BINARY_MULTIPLY_FLOAT",

Lib/opcode.py

@@ -2203,31 +2203,35 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             }
         }
 
-        TARGET(BINARY_SUBTRACT_INT) {
+        TARGET(BINARY_SUBTRACT_FAST) {
             PyObject *left = SECOND();
             PyObject *right = TOP();
-            DEOPT_IF(!PyLong_CheckExact(left), BINARY_SUBTRACT);
-            DEOPT_IF(!PyLong_CheckExact(right), BINARY_SUBTRACT);
+            int same = Py_IS_TYPE(left, Py_TYPE(right));
+            DEOPT_IF(!PyFloat_CheckExact(left) && !PyLong_CheckExact(left), BINARY_SUBTRACT);
+            DEOPT_IF(!PyFloat_CheckExact(right) && !PyLong_CheckExact(right), BINARY_SUBTRACT);
+            PyObject *sub = NULL;
             STAT_INC(BINARY_SUBTRACT, hit);
-            PyObject *sub = _PyLong_Subtract((PyLongObject *)left, (PyLongObject *)right);
-            SET_SECOND(sub);
-            Py_DECREF(right);
-            Py_DECREF(left);
-            STACK_SHRINK(1);
-            if (sub == NULL) {
-                goto error;
+            if (PyLong_CheckExact(left)) {
+                if (same != 0) {
+                    sub = _PyLong_Subtract((PyLongObject *)left, (PyLongObject *)right);
+                }
+                else {
+                    double left_double = PyLong_AsDouble(left);
+                    double dsub = left_double - ((PyFloatObject *)right)->ob_fval;
+                    sub = PyFloat_FromDouble(dsub);
+                }
+            }
+            else if (PyFloat_CheckExact(left)) {
+                if (same != 0) {
+                    double dsub = ((PyFloatObject *)left)->ob_fval - ((PyFloatObject *)right)->ob_fval;
+                    sub = PyFloat_FromDouble(dsub);
+                }
+                else {
+                    double right_double = PyLong_AsDouble(right);
+                    double dsub = ((PyFloatObject *)left)->ob_fval - right_double;
+                    sub = PyFloat_FromDouble(dsub);
+                }
             }
-            DISPATCH();
-        }
-
-        TARGET(BINARY_SUBTRACT_FLOAT) {
-            PyObject *left = SECOND();
-            PyObject *right = TOP();
-            DEOPT_IF(!PyFloat_CheckExact(left), BINARY_SUBTRACT);
-            DEOPT_IF(!PyFloat_CheckExact(right), BINARY_SUBTRACT);
-            STAT_INC(BINARY_SUBTRACT, hit);
-            double dsub = ((PyFloatObject *)left)->ob_fval - ((PyFloatObject *)right)->ob_fval;
-            PyObject *sub = PyFloat_FromDouble(dsub);
             SET_SECOND(sub);
             Py_DECREF(right);
             Py_DECREF(left);

Python/ceval.c

@@ -1260,16 +1260,20 @@ _Py_Specialize_BinaryMultiply(PyObject *left, PyObject *right, _Py_CODEUNIT *ins
 int
 _Py_Specialize_BinarySubtract(PyObject *left, PyObject *right, _Py_CODEUNIT *instr)
 {
-    if (!Py_IS_TYPE(left, Py_TYPE(right))) {
+    if (!PyLong_CheckExact(left) && !PyFloat_CheckExact(right)) {
+        SPECIALIZATION_FAIL(BINARY_SUBTRACT, SPEC_FAIL_DIFFERENT_TYPES);
+        goto fail;
+    }
+    if (!PyLong_CheckExact(right) && !PyFloat_CheckExact(right)) {
         SPECIALIZATION_FAIL(BINARY_SUBTRACT, SPEC_FAIL_DIFFERENT_TYPES);
         goto fail;
     }
     if (PyLong_CheckExact(left)) {
-        *instr = _Py_MAKECODEUNIT(BINARY_SUBTRACT_INT, initial_counter_value());
+        *instr = _Py_MAKECODEUNIT(BINARY_SUBTRACT_FAST, initial_counter_value());
         goto success;
     }
     else if (PyFloat_CheckExact(left)) {
-        *instr = _Py_MAKECODEUNIT(BINARY_SUBTRACT_FLOAT, initial_counter_value());
+        *instr = _Py_MAKECODEUNIT(BINARY_SUBTRACT_FAST, initial_counter_value());
         goto success;
     }
     else {