Merge branch 'PHP-7.0'

* PHP-7.0:
  Use hash_exists_ind in symbol table
This commit is contained in:
Xinchen Hui 2016-03-02 12:12:12 +08:00
commit f4f140c05d
2 changed files with 2 additions and 2 deletions

View File

@ -380,7 +380,7 @@ static zend_always_inline int zend_symtable_exists(HashTable *ht, zend_string *k
if (ZEND_HANDLE_NUMERIC(key, idx)) {
return zend_hash_index_exists(ht, idx);
} else {
return zend_hash_exists(ht, key);
return zend_hash_exists_ind(ht, key);
}
}

View File

@ -5423,7 +5423,7 @@ PHP_FUNCTION(array_key_exists)
switch (Z_TYPE_P(key)) {
case IS_STRING:
if (zend_symtable_find_ind(array, Z_STR_P(key))) {
if (zend_symtable_exists(array, Z_STR_P(key))) {
RETURN_TRUE;
}
RETURN_FALSE;