diff options
Diffstat (limited to 'Zend/zend_vm_def.h')
| -rw-r--r-- | Zend/zend_vm_def.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 1aabbfa762..0285f77038 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -4562,7 +4562,7 @@ ZEND_VM_C_LABEL(num_index_dim): ZEND_VM_C_GOTO(num_index_dim); } } - if (ht == &EG(symbol_table).ht) { + if (ht == &EG(symbol_table)) { zend_delete_global_variable(Z_STR_P(offset)); } else { zend_hash_del(ht, Z_STR_P(offset)); @@ -6442,8 +6442,8 @@ ZEND_VM_HANDLER(168, ZEND_BIND_GLOBAL, CV, CONST) /* We store "hash slot index" + 1 (NULL is a mark of uninitialized cache slot) */ idx = (uint32_t)(uintptr_t)CACHED_PTR(Z_CACHE_SLOT_P(varname)) - 1; - if (EXPECTED(idx < EG(symbol_table).ht.nNumUsed)) { - Bucket *p = EG(symbol_table).ht.arData + idx; + if (EXPECTED(idx < EG(symbol_table).nNumUsed)) { + Bucket *p = EG(symbol_table).arData + idx; if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF) && (EXPECTED(p->key == Z_STR_P(varname)) || @@ -6452,19 +6452,19 @@ ZEND_VM_HANDLER(168, ZEND_BIND_GLOBAL, CV, CONST) EXPECTED(p->key->len == Z_STRLEN_P(varname)) && EXPECTED(memcmp(p->key->val, Z_STRVAL_P(varname), Z_STRLEN_P(varname)) == 0)))) { - value = &EG(symbol_table).ht.arData[idx].val; + value = &EG(symbol_table).arData[idx].val; ZEND_VM_C_GOTO(check_indirect); } } - value = zend_hash_find(&EG(symbol_table).ht, Z_STR_P(varname)); + value = zend_hash_find(&EG(symbol_table), Z_STR_P(varname)); if (UNEXPECTED(value == NULL)) { - value = zend_hash_add_new(&EG(symbol_table).ht, Z_STR_P(varname), &EG(uninitialized_zval)); - idx = ((char*)value - (char*)EG(symbol_table).ht.arData) / sizeof(Bucket); + value = zend_hash_add_new(&EG(symbol_table), Z_STR_P(varname), &EG(uninitialized_zval)); + idx = ((char*)value - (char*)EG(symbol_table).arData) / sizeof(Bucket); /* Store "hash slot index" + 1 (NULL is a mark of uninitialized cache slot) */ CACHE_PTR(Z_CACHE_SLOT_P(varname), (void*)(uintptr_t)(idx + 1)); } else { - idx = ((char*)value - (char*)EG(symbol_table).ht.arData) / sizeof(Bucket); + idx = ((char*)value - (char*)EG(symbol_table).arData) / sizeof(Bucket); /* Store "hash slot index" + 1 (NULL is a mark of uninitialized cache slot) */ CACHE_PTR(Z_CACHE_SLOT_P(varname), (void*)(uintptr_t)(idx + 1)); ZEND_VM_C_LABEL(check_indirect): |