mirror of
https://github.com/python/cpython.git
synced 2024-11-23 18:04:37 +08:00
bpo-41061: Fix incorrect expressions in hashtable (GH-21028)
Signed-off-by: Christian Heimes <christian@python.org>
This commit is contained in:
parent
d780fa7931
commit
4901ea9526
@ -0,0 +1 @@
|
||||
Fix incorrect expressions and asserts in hashtable code and tests.
|
@ -197,8 +197,8 @@ test_hashtable(PyObject *self, PyObject *Py_UNUSED(args))
|
||||
for (key='a'; key <= 'z'; key++) {
|
||||
_Py_hashtable_entry_t *entry = _Py_hashtable_get_entry(table, TO_PTR(key));
|
||||
assert(entry != NULL);
|
||||
assert(entry->key = TO_PTR(key));
|
||||
assert(entry->value = TO_PTR(VALUE(key)));
|
||||
assert(entry->key == TO_PTR(key));
|
||||
assert(entry->value == TO_PTR(VALUE(key)));
|
||||
}
|
||||
|
||||
// Test _Py_hashtable_get()
|
||||
|
@ -133,7 +133,7 @@ _Py_hashtable_get_entry_generic(_Py_hashtable_t *ht, const void *key)
|
||||
{
|
||||
Py_uhash_t key_hash = ht->hash_func(key);
|
||||
size_t index = key_hash & (ht->nbuckets - 1);
|
||||
_Py_hashtable_entry_t *entry = entry = TABLE_HEAD(ht, index);
|
||||
_Py_hashtable_entry_t *entry = TABLE_HEAD(ht, index);
|
||||
while (1) {
|
||||
if (entry == NULL) {
|
||||
return NULL;
|
||||
@ -155,7 +155,7 @@ _Py_hashtable_get_entry_ptr(_Py_hashtable_t *ht, const void *key)
|
||||
{
|
||||
Py_uhash_t key_hash = _Py_hashtable_hash_ptr(key);
|
||||
size_t index = key_hash & (ht->nbuckets - 1);
|
||||
_Py_hashtable_entry_t *entry = entry = TABLE_HEAD(ht, index);
|
||||
_Py_hashtable_entry_t *entry = TABLE_HEAD(ht, index);
|
||||
while (1) {
|
||||
if (entry == NULL) {
|
||||
return NULL;
|
||||
|
Loading…
Reference in New Issue
Block a user