- while (ht->table[i->off] || valid[0] == i->off || valid[1] == i->off) {
- uintptr_t e = ht->table[i->off];
- if (e != HTABLE_DELETED || valid[0] == i->off || valid[1] == i->off) {
- if (get_extra_ptr_bits(ht, e) == h2) {
- return get_raw_ptr(ht, e);
- }
+ while (ht->table[i->off] || entry_actually_valid(ht, i->off)) {
+ if (!entry_is_deleted(ht, i->off)) {
+ if (get_extra_ptr_bits(ht, ht->table[i->off]) == h2)
+ return get_raw_ptr(ht, ht->table[i->off]);