From: Raymond Hettinger <python@rcn.com>
Date: Tue, 27 Jan 2015 06:06:43 +0000 (-0800)
Subject: Revert unintended part of the commit (the key==dummy test wasn't supposed to change).
X-Git-Tag: v3.5.0a1~87
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f8d1a31e70601f73a89b9f5aa9a8604df64743ac;p=python

Revert unintended part of the commit (the key==dummy test wasn't supposed to change).
---

diff --git a/Objects/setobject.c b/Objects/setobject.c
index 673490d6b8..d36bc0b3c1 100644
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -85,10 +85,8 @@ set_lookkey(PySetObject *so, PyObject *key, Py_hash_t hash)
             if (cmp > 0)                                          /* likely */
                 return entry;
         }
-        if (entry->hash == -1 && freeslot == NULL) {
-            assert(entry->key == dummy);
+        if (entry->key == dummy && freeslot == NULL)
             freeslot = entry;
-        }
 
         for (j = 1 ; j <= LINEAR_PROBES ; j++) {
             entry = &table[(i + j) & mask];
@@ -113,10 +111,8 @@ set_lookkey(PySetObject *so, PyObject *key, Py_hash_t hash)
                 if (cmp > 0)
                     return entry;
             }
-            if (entry->hash == -1 && freeslot == NULL) {
-                assert(entry->key == dummy);
+            if (entry->key == dummy && freeslot == NULL)
                 freeslot = entry;
-            }
         }
 
         perturb >>= PERTURB_SHIFT;