diff options
Diffstat (limited to 'Zend/zend_vm_execute.h')
| -rw-r--r-- | Zend/zend_vm_execute.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 40873ef693..1e1f62e16e 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -14076,7 +14076,7 @@ num_index_dim: 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)); @@ -16913,7 +16913,7 @@ num_index_dim: 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)); @@ -18350,7 +18350,7 @@ num_index_dim: 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)); @@ -19646,7 +19646,7 @@ num_index_dim: 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)); @@ -21754,7 +21754,7 @@ num_index_dim: 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)); @@ -23145,7 +23145,7 @@ num_index_dim: 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)); @@ -26797,7 +26797,7 @@ num_index_dim: 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)); @@ -27346,8 +27346,8 @@ static int ZEND_FASTCALL ZEND_BIND_GLOBAL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HAN /* 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)) || @@ -27356,19 +27356,19 @@ static int ZEND_FASTCALL ZEND_BIND_GLOBAL_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HAN 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; 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)); check_indirect: @@ -30934,7 +30934,7 @@ num_index_dim: 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)); @@ -32889,7 +32889,7 @@ num_index_dim: 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)); |