commit 83e7a2b7db047d70d29800a0f8d5c5beab5c936d
author Éric Araujo <merwok@netwok.org> Wed Mar 23 04:52:45 2011 +0100
committer Éric Araujo <merwok@netwok.org> Wed Mar 23 04:52:45 2011 +0100
tree 71b185d5d35b176d7b4734289d6c8a4e4838038c
parent c28af1f05fbbfada68a0234ad5beeaf15892e0f2
parent bd626d4e84aa76226aa4a807df45978f2b59ae5c

Merge from 3.2

Objects/setobject.c

diff --git a/Objects/setobject.c b/Objects/setobject.c
index 478b5cb..48edad8 100644
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -365,11 +365,12 @@
 {
     register Py_ssize_t n_used;
     PyObject *key = entry->key;
+    Py_hash_t hash = entry->hash;
 
     assert(so->fill <= so->mask);  /* at least one empty slot */
     n_used = so->used;
     Py_INCREF(key);
-    if (set_insert_key(so, key, entry->hash) == -1) {
+    if (set_insert_key(so, key, hash) == -1) {
         Py_DECREF(key);
         return -1;
     }
@@ -639,6 +640,7 @@
 {
     PySetObject *other;
     PyObject *key;
+    Py_hash_t hash;
     register Py_ssize_t i;
     register setentry *entry;
 
@@ -660,10 +662,11 @@
     for (i = 0; i <= other->mask; i++) {
         entry = &other->table[i];
         key = entry->key;
+        hash = entry->hash;
         if (key != NULL &&
             key != dummy) {
             Py_INCREF(key);
-            if (set_insert_key(so, key, entry->hash) == -1) {
+            if (set_insert_key(so, key, hash) == -1) {
                 Py_DECREF(key);
                 return -1;
             }