diff options
author | Éric Araujo <merwok@netwok.org> | 2011-03-23 04:52:08 +0100 |
---|---|---|
committer | Éric Araujo <merwok@netwok.org> | 2011-03-23 04:52:08 +0100 |
commit | bd626d4e84aa76226aa4a807df45978f2b59ae5c (patch) | |
tree | 04870840f4a32cd6b505c9e2802585b2314e6ab0 /Objects/setobject.c | |
parent | 924cbea46730a937c082e10512e7583a493e70af (diff) | |
parent | bbcfc1f2d926c1198b4c23a6e5640e3f3aee9d98 (diff) | |
download | cpython-git-bd626d4e84aa76226aa4a807df45978f2b59ae5c.tar.gz |
Branch merge
Diffstat (limited to 'Objects/setobject.c')
-rw-r--r-- | Objects/setobject.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Objects/setobject.c b/Objects/setobject.c index 478b5cb651..48edad8a31 100644 --- a/Objects/setobject.c +++ b/Objects/setobject.c @@ -365,11 +365,12 @@ set_add_entry(register PySetObject *so, setentry *entry) { 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 @@ set_merge(PySetObject *so, PyObject *otherset) { PySetObject *other; PyObject *key; + Py_hash_t hash; register Py_ssize_t i; register setentry *entry; @@ -660,10 +662,11 @@ set_merge(PySetObject *so, PyObject *otherset) 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; } |