diff options
Diffstat (limited to 'Zend/zend_hash.h')
| -rw-r--r-- | Zend/zend_hash.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h index 9d9ecfb85d..d71e76d5ce 100644 --- a/Zend/zend_hash.h +++ b/Zend/zend_hash.h @@ -264,7 +264,7 @@ static zend_always_inline int _zend_handle_numeric_str(const char *key, size_t l _zend_handle_numeric_str(key, length, &idx) #define ZEND_HANDLE_NUMERIC(key, idx) \ - ZEND_HANDLE_NUMERIC_STR((key)->val, (key)->len, idx) + ZEND_HANDLE_NUMERIC_STR(ZSTR_VAL(key), ZSTR_LEN(key), idx) static zend_always_inline zval *zend_hash_find_ind(const HashTable *ht, zend_string *key) @@ -900,7 +900,7 @@ static zend_always_inline zval *_zend_hash_append(HashTable *ht, zend_string *ke zend_string_hash_val(key); } p->key = key; - p->h = key->h; + p->h = ZSTR_H(key); nIndex = (uint32_t)p->h | ht->nTableMask; Z_NEXT(p->val) = HT_HASH(ht, nIndex); HT_HASH(ht, nIndex) = HT_IDX_TO_HASH(idx); @@ -922,7 +922,7 @@ static zend_always_inline zval *_zend_hash_append_ptr(HashTable *ht, zend_string zend_string_hash_val(key); } p->key = key; - p->h = key->h; + p->h = ZSTR_H(key); nIndex = (uint32_t)p->h | ht->nTableMask; Z_NEXT(p->val) = HT_HASH(ht, nIndex); HT_HASH(ht, nIndex) = HT_IDX_TO_HASH(idx); @@ -944,7 +944,7 @@ static zend_always_inline void _zend_hash_append_ind(HashTable *ht, zend_string zend_string_hash_val(key); } p->key = key; - p->h = key->h; + p->h = ZSTR_H(key); nIndex = (uint32_t)p->h | ht->nTableMask; Z_NEXT(p->val) = HT_HASH(ht, nIndex); HT_HASH(ht, nIndex) = HT_IDX_TO_HASH(idx); |