bpo-1617161: Make the hash and equality of methods not depending on the value of self. (GH-7848)
* The hash of BuiltinMethodType instances no longer depends on the hash
of __self__. It depends now on the hash of id(__self__).
* The hash and equality of ModuleType and MethodWrapperType instances no
longer depend on the hash and equality of __self__. They depend now on
the hash and equality of id(__self__).
* MethodWrapperType instances no longer support ordering.
diff --git a/Objects/classobject.c b/Objects/classobject.c
index 095b0ca..a193ada 100644
--- a/Objects/classobject.c
+++ b/Objects/classobject.c
@@ -225,13 +225,9 @@
b = (PyMethodObject *)other;
eq = PyObject_RichCompareBool(a->im_func, b->im_func, Py_EQ);
if (eq == 1) {
- if (a->im_self == NULL || b->im_self == NULL)
- eq = a->im_self == b->im_self;
- else
- eq = PyObject_RichCompareBool(a->im_self, b->im_self,
- Py_EQ);
+ eq = (a->im_self == b->im_self);
}
- if (eq < 0)
+ else if (eq < 0)
return NULL;
if (op == Py_EQ)
res = eq ? Py_True : Py_False;
@@ -274,11 +270,9 @@
{
Py_hash_t x, y;
if (a->im_self == NULL)
- x = PyObject_Hash(Py_None);
+ x = _Py_HashPointer(Py_None);
else
- x = PyObject_Hash(a->im_self);
- if (x == -1)
- return -1;
+ x = _Py_HashPointer(a->im_self);
y = PyObject_Hash(a->im_func);
if (y == -1)
return -1;
diff --git a/Objects/descrobject.c b/Objects/descrobject.c
index dfad1ec..b1bee90 100644
--- a/Objects/descrobject.c
+++ b/Objects/descrobject.c
@@ -1038,38 +1038,35 @@
static PyObject *
wrapper_richcompare(PyObject *a, PyObject *b, int op)
{
- PyWrapperDescrObject *a_descr, *b_descr;
+ wrapperobject *wa, *wb;
+ int eq;
assert(a != NULL && b != NULL);
/* both arguments should be wrapperobjects */
- if (!Wrapper_Check(a) || !Wrapper_Check(b)) {
+ if ((op != Py_EQ && op != Py_NE)
+ || !Wrapper_Check(a) || !Wrapper_Check(b))
+ {
Py_RETURN_NOTIMPLEMENTED;
}
- /* compare by descriptor address; if the descriptors are the same,
- compare by the objects they're bound to */
- a_descr = ((wrapperobject *)a)->descr;
- b_descr = ((wrapperobject *)b)->descr;
- if (a_descr == b_descr) {
- a = ((wrapperobject *)a)->self;
- b = ((wrapperobject *)b)->self;
- return PyObject_RichCompare(a, b, op);
+ wa = (wrapperobject *)a;
+ wb = (wrapperobject *)b;
+ eq = (wa->descr == wb->descr && wa->self == wb->self);
+ if (eq == (op == Py_EQ)) {
+ Py_RETURN_TRUE;
}
-
- Py_RETURN_RICHCOMPARE(a_descr, b_descr, op);
+ else {
+ Py_RETURN_FALSE;
+ }
}
static Py_hash_t
wrapper_hash(wrapperobject *wp)
{
Py_hash_t x, y;
- x = _Py_HashPointer(wp->descr);
- if (x == -1)
- return -1;
- y = PyObject_Hash(wp->self);
- if (y == -1)
- return -1;
+ x = _Py_HashPointer(wp->self);
+ y = _Py_HashPointer(wp->descr);
x = x ^ y;
if (x == -1)
x = -2;
diff --git a/Objects/methodobject.c b/Objects/methodobject.c
index 9606768..a7042ca 100644
--- a/Objects/methodobject.c
+++ b/Objects/methodobject.c
@@ -251,16 +251,8 @@
meth_hash(PyCFunctionObject *a)
{
Py_hash_t x, y;
- if (a->m_self == NULL)
- x = 0;
- else {
- x = PyObject_Hash(a->m_self);
- if (x == -1)
- return -1;
- }
+ x = _Py_HashPointer(a->m_self);
y = _Py_HashPointer((void*)(a->m_ml->ml_meth));
- if (y == -1)
- return -1;
x ^= y;
if (x == -1)
x = -2;