From: Raymond Hettinger <python@rcn.com>
Date: Wed, 24 Aug 2005 00:24:40 +0000 (+0000)
Subject: * Add a fast equality check path for frozensets where the hash value has
X-Git-Tag: v2.5a0~1478
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9c1491f37c4884d72b18a0493c757e7c1f5e2814;p=thirdparty%2FPython%2Fcpython.git

* Add a fast equality check path for frozensets where the hash value has
  already been computed.
* Apply a GET_SIZE macro().
---

diff --git a/Objects/setobject.c b/Objects/setobject.c
index 9a54aed87683..8787347617a6 100644
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -1495,12 +1495,15 @@ set_richcompare(PySetObject *v, PyObject *w, int op)
 	case Py_EQ:
 		if (PySet_GET_SIZE(v) != PySet_GET_SIZE(w))
 			Py_RETURN_FALSE;
+		if (v->hash != -1  &&
+		    ((PySetObject *)w)->hash != -1 &&
+		    v->hash != ((PySetObject *)w)->hash)
+			Py_RETURN_FALSE;
 		return set_issubset(v, w);
 	case Py_NE:
-		if (PySet_GET_SIZE(v) != PySet_GET_SIZE(w))
-			Py_RETURN_TRUE;
-		r1 = set_issubset(v, w);
-		assert (r1 != NULL);
+		r1 = set_richcompare(v, w, Py_EQ);
+		if (r1 == NULL)
+			return NULL;
 		r2 = PyBool_FromLong(PyObject_Not(r1));
 		Py_DECREF(r1);
 		return r2;
@@ -1956,7 +1959,7 @@ PySet_Size(PyObject *anyset)
 		PyErr_BadInternalCall();
 		return -1;
 	}
-	return ((PySetObject *)anyset)->used;
+	return PySet_GET_SIZE(anyset);
 }
 
 int