com php-src: Simplify condition: Zend/zend_hash.c

From: Date: Fri, 19 Dec 2014 10:06:34 +0000
Subject: com php-src: Simplify condition: Zend/zend_hash.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83801@lists.php.net to get a copy of this message
Commit: 441270db2c44c299467925d4c97ea5c5251ac474 Author: Dmitry Stogov <dmitry@zend.com> Fri, 19 Dec 2014 13:06:34 +0300 Parents: 373a7a4a753a9db07559b8f3ca8318b36cbb4edc Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=441270db2c44c299467925d4c97ea5c5251ac474 Log: Simplify condition Changed paths: M Zend/zend_hash.c Diff: diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c index cc593f6..13a26ed 100644 --- a/Zend/zend_hash.c +++ b/Zend/zend_hash.c @@ -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 {

« previous php.cvs (#83801) next »