]> granicus.if.org Git - php/commitdiff
Simplify condition
authorDmitry Stogov <dmitry@zend.com>
Fri, 19 Dec 2014 10:06:34 +0000 (13:06 +0300)
committerDmitry Stogov <dmitry@zend.com>
Fri, 19 Dec 2014 10:06:34 +0000 (13:06 +0300)
Zend/zend_hash.c

index cc593f657a920a248c2c65fe9c7556fd32b4c070..13a26edb48a59b704ebf8b187e42101812db21f4 100644 (file)
@@ -449,8 +449,8 @@ static zend_always_inline zval *_zend_hash_index_add_or_update_i(HashTable *ht,
                        }
                } else if (EXPECTED(h < ht->nTableSize)) {
                        p = ht->arData + h;
-               } else if (h < ht->nTableSize * 2 &&
-                                  ht->nTableSize - ht->nNumOfElements < ht->nTableSize / 2) {
+               } else if ((h >> 1) < ht->nTableSize &&
+                          (ht->nTableSize >> 1) < ht->nNumOfElements) {
                        zend_hash_packed_grow(ht);
                        p = ht->arData + h;
                } else {