py/objboundmeth: Optimise check for types in binary_op.

dpgeorge · dpgeorge · commit 516385c4ccbb · 2023-10-13T15:29:09.000+11:00
Signed-off-by: Damien George &lt;damien@micropython.org&gt;
diff --git a/py/objboundmeth.c b/py/objboundmeth.c
@@ -94,7 +94,10 @@ STATIC mp_obj_t bound_meth_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 }
 
 STATIC mp_obj_t bound_meth_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
-    if (!mp_obj_is_type(rhs_in, &mp_type_bound_meth) || op != MP_BINARY_OP_EQUAL) {
+    // The MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE flag is clear for this type, so if this
+    // function is called with MP_BINARY_OP_EQUAL then lhs_in and rhs_in must have the
+    // same type, which is mp_type_bound_meth.
+    if (op != MP_BINARY_OP_EQUAL) {
         return MP_OBJ_NULL; // op not supported
     }
     mp_obj_bound_meth_t *lhs = MP_OBJ_TO_PTR(lhs_in);
diff --git a/tests/basics/boundmeth1.py b/tests/basics/boundmeth1.py
@@ -33,6 +33,8 @@ def h(self, a, b, c, d, e, f):
 except AttributeError:
     print("AttributeError")
 
+print("--------")
+
 # bound method comparison with same object
 a = A()
 m1 = a.f
@@ -51,6 +53,14 @@ def h(self, a, b, c, d, e, f):
 print(m2 == a1.f)  # should result in False
 print(m1 != a2.f)  # should result in True
 
+# bound method comparison with non-bound-method objects
+print(A().f == None)  # should result in False
+print(A().f != None)  # should result in True
+print(None == A().f)  # should result in False
+print(None != A().f)  # should result in True
+
+print("--------")
+
 # bound method hashing
 a = A()
 m1 = a.f

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,10 @@ STATIC mp_obj_t bound_meth_unary_op(mp_unary_op_t op, mp_obj_t self_in) {`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`STATIC mp_obj_t bound_meth_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {`
`97`		`- if (!mp_obj_is_type(rhs_in, &mp_type_bound_meth) \|\| op != MP_BINARY_OP_EQUAL) {`
	`97`	`+ // The MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE flag is clear for this type, so if this`
	`98`	`+ // function is called with MP_BINARY_OP_EQUAL then lhs_in and rhs_in must have the`
	`99`	`+ // same type, which is mp_type_bound_meth.`
	`100`	`+ if (op != MP_BINARY_OP_EQUAL) {`
`98`	`101`	`return MP_OBJ_NULL; // op not supported`
`99`	`102`	`}`
`100`	`103`	`mp_obj_bound_meth_t *lhs = MP_OBJ_TO_PTR(lhs_in);`