gh-100165: Add BINARY_OP_AND_INT for integer & operation.

corona10 · Dec 11, 2022 · Dec 11, 2022 · Dec 11, 2022 · Dec 12, 2022 · Dec 11, 2022
commit 382e3afd0016d1fff3610cd854a811379d264861
diff --git a/Include/internal/pycore_long.h b/Include/internal/pycore_long.h
@@ -81,6 +81,7 @@ static inline PyObject* _PyLong_FromUnsignedChar(unsigned char i)
 PyObject *_PyLong_Add(PyLongObject *left, PyLongObject *right);
 PyObject *_PyLong_Multiply(PyLongObject *left, PyLongObject *right);
 PyObject *_PyLong_Subtract(PyLongObject *left, PyLongObject *right);
+PyObject *_PyLong_And(PyLongObject *left, PyLongObject *right);
 
 int _PyLong_AssignValue(PyObject **target, Py_ssize_t value);
 

diff --git a/Lib/opcode.py b/Lib/opcode.py
@@ -287,6 +287,7 @@ def pseudo_op(name, op, real_ops):
         "BINARY_OP_MULTIPLY_INT",
         "BINARY_OP_SUBTRACT_FLOAT",
         "BINARY_OP_SUBTRACT_INT",
+        "BINARY_OP_AND_INT",
     ],
     "BINARY_SUBSCR": [
         "BINARY_SUBSCR_DICT",

diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-12-11-13-22-59.gh-issue-100165.GE1Iui.rst b/Misc/NEWS.d/next/Core and Builtins/2022-12-11-13-22-59.gh-issue-100165.GE1Iui.rst
@@ -0,0 +1,2 @@
+Add ``BINARY_OP_AND_INT`` for and operation between int objects. Patch by
+Dong-hee Na.
diff --git a/Objects/longobject.c b/Objects/longobject.c
@@ -5299,16 +5299,20 @@ long_bitwise(PyLongObject *a,
     return (PyObject *)maybe_small_long(long_normalize(z));
 }
 
+PyObject *
+_PyLong_And(PyLongObject *a, PyLongObject *b)
+{
+    if (IS_MEDIUM_VALUE(a) && IS_MEDIUM_VALUE(b)) {
+        return _PyLong_FromSTwoDigits(medium_value(a) & medium_value(b));
+    }
+    return long_bitwise(a, '&', b);
+}
+
 static PyObject *
 long_and(PyObject *a, PyObject *b)
 {
     CHECK_BINOP(a, b);
-    PyLongObject *x = (PyLongObject*)a;
-    PyLongObject *y = (PyLongObject*)b;
-    if (IS_MEDIUM_VALUE(x) && IS_MEDIUM_VALUE(y)) {
-        return _PyLong_FromSTwoDigits(medium_value(x) & medium_value(y));
-    }
-    return long_bitwise(x, '&', y);
+    return _PyLong_And((PyLongObject *)a, (PyLongObject *)b);
 }
 
 static PyObject *

@@ -211,6 +211,7 @@ dummy_func(
             BINARY_OP_MULTIPLY_INT,
             BINARY_OP_SUBTRACT_FLOAT,
             BINARY_OP_SUBTRACT_INT,
+            BINARY_OP_AND_INT,
         };
 
 
@@ -332,6 +333,17 @@ dummy_func(
             ERROR_IF(sum == NULL, error);
         }
 
+        inst(BINARY_OP_AND_INT, (left, right, unused/1 -- and)) {
+            assert(cframe.use_tracing == 0);
+            DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
+            DEOPT_IF(Py_TYPE(right) != Py_TYPE(left), BINARY_OP);
+            STAT_INC(BINARY_OP, hit);
+            and = _PyLong_And((PyLongObject *)left, (PyLongObject *)right);
+            _Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
+            _Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
+            ERROR_IF(and == NULL, error);
+        }
+
         family(binary_subscr, INLINE_CACHE_ENTRIES_BINARY_SUBSCR) = {
             BINARY_SUBSCR,
             BINARY_SUBSCR_DICT,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Add ``BINARY_OP_AND_INT`` for and operation between int objects. Patch by
		Dong-hee Na.
Comment thread corona10 marked this conversation as resolved. Outdated