Skip to content

Commit 79b5478

Browse files
morrisonlevimorrisonlevi
committed
Convert zend_hash_find_ex(..., 1) to zend_hash_find_known_hash(...)
Also convert zend_hash_find_ex(..., 0) to zend_hash_find(...)
1 parent 8d4a949 commit 79b5478

18 files changed

+158
-158
lines changed

‎Zend/Optimizer/zend_func_info.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,7 @@ static uint32_t get_internal_func_info(
811811
return 0;
812812
}
813813

814-
zval *zv = zend_hash_find_ex(&func_info, callee_func->common.function_name, 1);
814+
zval *zv = zend_hash_find_known_hash(&func_info, callee_func->common.function_name);
815815
if (!zv) {
816816
return 0;
817817
}

‎Zend/zend_builtin_functions.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ ZEND_FUNCTION(error_reporting)
382382
zend_ini_entry *p = EG(error_reporting_ini_entry);
383383

384384
if (!p) {
385-
zval *zv = zend_hash_find_ex(EG(ini_directives), ZSTR_KNOWN(ZEND_STR_ERROR_REPORTING), 1);
385+
zval *zv = zend_hash_find_known_hash(EG(ini_directives), ZSTR_KNOWN(ZEND_STR_ERROR_REPORTING));
386386
if (!zv) {
387387
/* Ini setting does not exist -- can this happen? */
388388
RETURN_LONG(old_error_reporting);

‎Zend/zend_compile.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,7 +1059,7 @@ ZEND_API void function_add_ref(zend_function *function) /* {{{ */
10591059

10601060
static zend_never_inline ZEND_COLD ZEND_NORETURN void do_bind_function_error(zend_string *lcname, zend_op_array *op_array, bool compile_time) /* {{{ */
10611061
{
1062-
zval *zv = zend_hash_find_ex(compile_time ? CG(function_table) : EG(function_table), lcname, 1);
1062+
zval *zv = zend_hash_find_known_hash(compile_time ? CG(function_table) : EG(function_table), lcname);
10631063
int error_level = compile_time ? E_COMPILE_ERROR : E_ERROR;
10641064
zend_function *old_function;
10651065

@@ -1102,7 +1102,7 @@ ZEND_API zend_result do_bind_class(zval *lcname, zend_string *lc_parent_name) /*
11021102

11031103
rtd_key = lcname + 1;
11041104

1105-
zv = zend_hash_find_ex(EG(class_table), Z_STR_P(rtd_key), 1);
1105+
zv = zend_hash_find_known_hash(EG(class_table), Z_STR_P(rtd_key));
11061106

11071107
if (UNEXPECTED(!zv)) {
11081108
ce = zend_hash_find_ptr(EG(class_table), Z_STR_P(lcname));
@@ -1114,7 +1114,7 @@ ZEND_API zend_result do_bind_class(zval *lcname, zend_string *lc_parent_name) /*
11141114
ZEND_ASSERT(EG(current_execute_data)->func->op_array.fn_flags & ZEND_ACC_PRELOADED);
11151115
if (zend_preload_autoload
11161116
&& zend_preload_autoload(EG(current_execute_data)->func->op_array.filename) == SUCCESS) {
1117-
zv = zend_hash_find_ex(EG(class_table), Z_STR_P(rtd_key), 1);
1117+
zv = zend_hash_find_known_hash(EG(class_table), Z_STR_P(rtd_key));
11181118
if (EXPECTED(zv != NULL)) {
11191119
break;
11201120
}
@@ -1383,7 +1383,7 @@ ZEND_API void zend_do_delayed_early_binding(zend_op_array *op_array, uint32_t fi
13831383
while (opline_num != (uint32_t)-1) {
13841384
const zend_op *opline = &op_array->opcodes[opline_num];
13851385
zval *lcname = RT_CONSTANT(opline, opline->op1);
1386-
zval *zv = zend_hash_find_ex(EG(class_table), Z_STR_P(lcname + 1), 1);
1386+
zval *zv = zend_hash_find_known_hash(EG(class_table), Z_STR_P(lcname + 1));
13871387

13881388
if (zv) {
13891389
zend_class_entry *ce = Z_CE_P(zv);

‎Zend/zend_exceptions.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -547,14 +547,14 @@ static void _build_trace_string(smart_str *str, HashTable *ht, uint32_t num) /*
547547
smart_str_append_long(str, num);
548548
smart_str_appendc(str, ' ');
549549

550-
file = zend_hash_find_ex(ht, ZSTR_KNOWN(ZEND_STR_FILE), 1);
550+
file = zend_hash_find_known_hash(ht, ZSTR_KNOWN(ZEND_STR_FILE));
551551
if (file) {
552552
if (Z_TYPE_P(file) != IS_STRING) {
553553
zend_error(E_WARNING, "File name is not a string");
554554
smart_str_appends(str, "[unknown file]: ");
555555
} else{
556556
zend_long line = 0;
557-
tmp = zend_hash_find_ex(ht, ZSTR_KNOWN(ZEND_STR_LINE), 1);
557+
tmp = zend_hash_find_known_hash(ht, ZSTR_KNOWN(ZEND_STR_LINE));
558558
if (tmp) {
559559
if (Z_TYPE_P(tmp) == IS_LONG) {
560560
line = Z_LVAL_P(tmp);
@@ -574,7 +574,7 @@ static void _build_trace_string(smart_str *str, HashTable *ht, uint32_t num) /*
574574
TRACE_APPEND_KEY(ZSTR_KNOWN(ZEND_STR_TYPE));
575575
TRACE_APPEND_KEY(ZSTR_KNOWN(ZEND_STR_FUNCTION));
576576
smart_str_appendc(str, '(');
577-
tmp = zend_hash_find_ex(ht, ZSTR_KNOWN(ZEND_STR_ARGS), 1);
577+
tmp = zend_hash_find_known_hash(ht, ZSTR_KNOWN(ZEND_STR_ARGS));
578578
if (tmp) {
579579
if (Z_TYPE_P(tmp) == IS_ARRAY) {
580580
size_t last_len = ZSTR_LEN(str->s);

‎Zend/zend_execute.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2554,7 +2554,7 @@ static zend_never_inline zval* ZEND_FASTCALL zend_find_array_dim_slow(HashTable
25542554
return zend_hash_index_find(ht, hval);
25552555
} else if (Z_TYPE_P(offset) == IS_NULL) {
25562556
str_idx:
2557-
return zend_hash_find_ex(ht, ZSTR_EMPTY_ALLOC(), 1);
2557+
return zend_hash_find_known_hash(ht, ZSTR_EMPTY_ALLOC());
25582558
} else if (Z_TYPE_P(offset) == IS_FALSE) {
25592559
hval = 0;
25602560
goto num_idx;
@@ -2866,7 +2866,7 @@ static zend_always_inline void zend_fetch_property_address(zval *result, zval *c
28662866
}
28672867
zobj->properties = zend_array_dup(zobj->properties);
28682868
}
2869-
ptr = zend_hash_find_ex(zobj->properties, Z_STR_P(prop_ptr), 1);
2869+
ptr = zend_hash_find_known_hash(zobj->properties, Z_STR_P(prop_ptr));
28702870
if (EXPECTED(ptr)) {
28712871
ZVAL_INDIRECT(result, ptr);
28722872
return;
@@ -4398,12 +4398,12 @@ static zend_always_inline zend_result _zend_quick_get_constant(
43984398
zend_constant *c = NULL;
43994399

44004400
/* null/true/false are resolved during compilation, so don't check for them here. */
4401-
zv = zend_hash_find_ex(EG(zend_constants), Z_STR_P(key), 1);
4401+
zv = zend_hash_find_known_hash(EG(zend_constants), Z_STR_P(key));
44024402
if (zv) {
44034403
c = (zend_constant*)Z_PTR_P(zv);
44044404
} else if (flags & IS_CONSTANT_UNQUALIFIED_IN_NAMESPACE) {
44054405
key++;
4406-
zv = zend_hash_find_ex(EG(zend_constants), Z_STR_P(key), 1);
4406+
zv = zend_hash_find_known_hash(EG(zend_constants), Z_STR_P(key));
44074407
if (zv) {
44084408
c = (zend_constant*)Z_PTR_P(zv);
44094409
}

‎Zend/zend_execute_API.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1617,7 +1617,7 @@ ZEND_API void zend_attach_symbol_table(zend_execute_data *execute_data) /* {{{ *
16171617
zval *var = EX_VAR_NUM(0);
16181618

16191619
do {
1620-
zval *zv = zend_hash_find_ex(ht, *str, 1);
1620+
zval *zv = zend_hash_find_known_hash(ht, *str);
16211621

16221622
if (zv) {
16231623
if (Z_TYPE_P(zv) == IS_INDIRECT) {

‎Zend/zend_inheritance.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1160,7 +1160,7 @@ static zend_never_inline void do_inheritance_check_on_method(
11601160

11611161
static zend_always_inline void do_inherit_method(zend_string *key, zend_function *parent, zend_class_entry *ce, bool is_interface, bool checked) /* {{{ */
11621162
{
1163-
zval *child = zend_hash_find_ex(&ce->function_table, key, 1);
1163+
zval *child = zend_hash_find_known_hash(&ce->function_table, key);
11641164

11651165
if (child) {
11661166
zend_function *func = (zend_function*)Z_PTR_P(child);
@@ -1235,7 +1235,7 @@ static void emit_incompatible_property_error(
12351235

12361236
static void do_inherit_property(zend_property_info *parent_info, zend_string *key, zend_class_entry *ce) /* {{{ */
12371237
{
1238-
zval *child = zend_hash_find_ex(&ce->properties_info, key, 1);
1238+
zval *child = zend_hash_find_known_hash(&ce->properties_info, key);
12391239
zend_property_info *child_info;
12401240

12411241
if (UNEXPECTED(child)) {
@@ -1340,7 +1340,7 @@ static void zend_do_inherit_interfaces(zend_class_entry *ce, const zend_class_en
13401340

13411341
static void do_inherit_class_constant(zend_string *name, zend_class_constant *parent_const, zend_class_entry *ce) /* {{{ */
13421342
{
1343-
zval *zv = zend_hash_find_ex(&ce->constants_table, name, 1);
1343+
zval *zv = zend_hash_find_known_hash(&ce->constants_table, name);
13441344
zend_class_constant *c;
13451345

13461346
if (zv != NULL) {
@@ -1644,7 +1644,7 @@ ZEND_API void zend_do_inheritance_ex(zend_class_entry *ce, zend_class_entry *par
16441644
static bool do_inherit_constant_check(
16451645
zend_class_entry *ce, zend_class_constant *parent_constant, zend_string *name
16461646
) {
1647-
zval *zv = zend_hash_find_ex(&ce->constants_table, name, 1);
1647+
zval *zv = zend_hash_find_known_hash(&ce->constants_table, name);
16481648
if (zv == NULL) {
16491649
return true;
16501650
}
@@ -2870,7 +2870,7 @@ ZEND_API zend_class_entry *zend_do_link_class(zend_class_entry *ce, zend_string
28702870
if (traits_and_interfaces) {
28712871
free_alloca(traits_and_interfaces, use_heap);
28722872
}
2873-
zv = zend_hash_find_ex(CG(class_table), key, 1);
2873+
zv = zend_hash_find_known_hash(CG(class_table), key);
28742874
Z_CE_P(zv) = ret;
28752875
if (ZSTR_HAS_CE_CACHE(ret->name)) {
28762876
ZSTR_SET_CE_CACHE(ret->name, ret);
@@ -2888,7 +2888,7 @@ ZEND_API zend_class_entry *zend_do_link_class(zend_class_entry *ce, zend_string
28882888
}
28892889
/* Lazy class loading */
28902890
ce = zend_lazy_class_load(ce);
2891-
zv = zend_hash_find_ex(CG(class_table), key, 1);
2891+
zv = zend_hash_find_known_hash(CG(class_table), key);
28922892
Z_CE_P(zv) = ce;
28932893
if (CG(unlinked_uses)
28942894
&& zend_hash_index_del(CG(unlinked_uses), (zend_long)(zend_uintptr_t)proto) == SUCCESS) {
@@ -2898,7 +2898,7 @@ ZEND_API zend_class_entry *zend_do_link_class(zend_class_entry *ce, zend_string
28982898
/* Lazy class loading */
28992899
ce = zend_lazy_class_load(ce);
29002900
ce->ce_flags &= ~ZEND_ACC_FILE_CACHED;
2901-
zv = zend_hash_find_ex(CG(class_table), key, 1);
2901+
zv = zend_hash_find_known_hash(CG(class_table), key);
29022902
Z_CE_P(zv) = ce;
29032903
if (CG(unlinked_uses)
29042904
&& zend_hash_index_del(CG(unlinked_uses), (zend_long)(zend_uintptr_t)proto) == SUCCESS) {
@@ -2987,7 +2987,7 @@ ZEND_API zend_class_entry *zend_do_link_class(zend_class_entry *ce, zend_string
29872987
ce->inheritance_cache = NULL;
29882988
new_ce = zend_inheritance_cache_add(ce, proto, parent, traits_and_interfaces, ht);
29892989
if (new_ce) {
2990-
zv = zend_hash_find_ex(CG(class_table), key, 1);
2990+
zv = zend_hash_find_known_hash(CG(class_table), key);
29912991
ce = new_ce;
29922992
Z_CE_P(zv) = ce;
29932993
}
@@ -3019,7 +3019,7 @@ static inheritance_status zend_can_early_bind(zend_class_entry *ce, zend_class_e
30193019
inheritance_status overall_status = INHERITANCE_SUCCESS;
30203020

30213021
ZEND_HASH_FOREACH_STR_KEY_PTR(&parent_ce->function_table, key, parent_func) {
3022-
zval *zv = zend_hash_find_ex(&ce->function_table, key, 1);
3022+
zval *zv = zend_hash_find_known_hash(&ce->function_table, key);
30233023
if (zv) {
30243024
zend_function *child_func = Z_FUNC_P(zv);
30253025
inheritance_status status =
@@ -3041,7 +3041,7 @@ static inheritance_status zend_can_early_bind(zend_class_entry *ce, zend_class_e
30413041
continue;
30423042
}
30433043

3044-
zv = zend_hash_find_ex(&ce->properties_info, key, 1);
3044+
zv = zend_hash_find_known_hash(&ce->properties_info, key);
30453045
if (zv) {
30463046
zend_property_info *child_info = Z_PTR_P(zv);
30473047
if (ZEND_TYPE_IS_SET(child_info->type)) {
@@ -3146,7 +3146,7 @@ zend_class_entry *zend_try_early_bind(zend_class_entry *ce, zend_class_entry *pa
31463146
ce->inheritance_cache = NULL;
31473147
new_ce = zend_inheritance_cache_add(ce, proto, parent_ce, NULL, ht);
31483148
if (new_ce) {
3149-
zval *zv = zend_hash_find_ex(CG(class_table), lcname, 1);
3149+
zval *zv = zend_hash_find_known_hash(CG(class_table), lcname);
31503150
ce = new_ce;
31513151
Z_CE_P(zv) = ce;
31523152
}

‎Zend/zend_object_handlers.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1847,10 +1847,10 @@ ZEND_API int zend_std_cast_object_tostring(zend_object *readobj, zval *writeobj,
18471847

18481848
ZEND_API int zend_std_get_closure(zend_object *obj, zend_class_entry **ce_ptr, zend_function **fptr_ptr, zend_object **obj_ptr, bool check_only) /* {{{ */
18491849
{
1850-
zval *func;
18511850
zend_class_entry *ce = obj->ce;
1851+
zval *func = zend_hash_find_known_hash(&ce->function_table, ZSTR_KNOWN(ZEND_STR_MAGIC_INVOKE));
18521852

1853-
if ((func = zend_hash_find_ex(&ce->function_table, ZSTR_KNOWN(ZEND_STR_MAGIC_INVOKE), 1)) == NULL) {
1853+
if (func == NULL) {
18541854
return FAILURE;
18551855
}
18561856
*fptr_ptr = Z_FUNC_P(func);

‎Zend/zend_vm_def.h

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2080,7 +2080,7 @@ ZEND_VM_C_LABEL(fetch_obj_r_fast_copy):
20802080
}
20812081
CACHE_PTR_EX(cache_slot + 1, (void*)ZEND_DYNAMIC_PROPERTY_OFFSET);
20822082
}
2083-
retval = zend_hash_find_ex(zobj->properties, name, 1);
2083+
retval = zend_hash_find_known_hash(zobj->properties, name);
20842084
if (EXPECTED(retval)) {
20852085
uintptr_t idx = (char*)retval - (char*)zobj->properties->arData;
20862086
CACHE_PTR_EX(cache_slot + 1, (void*)ZEND_ENCODE_DYN_PROP_OFFSET(idx));
@@ -2236,7 +2236,7 @@ ZEND_VM_C_LABEL(fetch_obj_is_fast_copy):
22362236
}
22372237
CACHE_PTR_EX(cache_slot + 1, (void*)ZEND_DYNAMIC_PROPERTY_OFFSET);
22382238
}
2239-
retval = zend_hash_find_ex(zobj->properties, name, 1);
2239+
retval = zend_hash_find_known_hash(zobj->properties, name);
22402240
if (EXPECTED(retval)) {
22412241
uintptr_t idx = (char*)retval - (char*)zobj->properties->arData;
22422242
CACHE_PTR_EX(cache_slot + 1, (void*)ZEND_ENCODE_DYN_PROP_OFFSET(idx));
@@ -2402,7 +2402,7 @@ ZEND_VM_C_LABEL(fast_assign_obj):
24022402
}
24032403
zobj->properties = zend_array_dup(zobj->properties);
24042404
}
2405-
property_val = zend_hash_find_ex(zobj->properties, name, 1);
2405+
property_val = zend_hash_find_known_hash(zobj->properties, name);
24062406
if (property_val) {
24072407
ZEND_VM_C_GOTO(fast_assign_obj);
24082408
}
@@ -3676,7 +3676,7 @@ ZEND_VM_HOT_HANDLER(59, ZEND_INIT_FCALL_BY_NAME, ANY, CONST, NUM|CACHE_SLOT)
36763676
fbc = CACHED_PTR(opline->result.num);
36773677
if (UNEXPECTED(fbc == NULL)) {
36783678
function_name = (zval*)RT_CONSTANT(opline, opline->op2);
3679-
func = zend_hash_find_ex(EG(function_table), Z_STR_P(function_name+1), 1);
3679+
func = zend_hash_find_known_hash(EG(function_table), Z_STR_P(function_name+1));
36803680
if (UNEXPECTED(func == NULL)) {
36813681
ZEND_VM_DISPATCH_TO_HELPER(zend_undefined_function_helper);
36823682
}
@@ -3820,9 +3820,9 @@ ZEND_VM_HOT_HANDLER(69, ZEND_INIT_NS_FCALL_BY_NAME, ANY, CONST, NUM|CACHE_SLOT)
38203820
fbc = CACHED_PTR(opline->result.num);
38213821
if (UNEXPECTED(fbc == NULL)) {
38223822
func_name = (zval *)RT_CONSTANT(opline, opline->op2);
3823-
func = zend_hash_find_ex(EG(function_table), Z_STR_P(func_name + 1), 1);
3823+
func = zend_hash_find_known_hash(EG(function_table), Z_STR_P(func_name + 1));
38243824
if (func == NULL) {
3825-
func = zend_hash_find_ex(EG(function_table), Z_STR_P(func_name + 2), 1);
3825+
func = zend_hash_find_known_hash(EG(function_table), Z_STR_P(func_name + 2));
38263826
if (UNEXPECTED(func == NULL)) {
38273827
ZEND_VM_DISPATCH_TO_HELPER(zend_undefined_function_helper);
38283828
}
@@ -3853,7 +3853,7 @@ ZEND_VM_HOT_HANDLER(61, ZEND_INIT_FCALL, NUM, CONST, NUM|CACHE_SLOT)
38533853
fbc = CACHED_PTR(opline->result.num);
38543854
if (UNEXPECTED(fbc == NULL)) {
38553855
fname = (zval*)RT_CONSTANT(opline, opline->op2);
3856-
func = zend_hash_find_ex(EG(function_table), Z_STR_P(fname), 1);
3856+
func = zend_hash_find_known_hash(EG(function_table), Z_STR_P(fname));
38573857
if (UNEXPECTED(func == NULL)) {
38583858
ZEND_VM_DISPATCH_TO_HELPER(zend_undefined_function_helper);
38593859
}
@@ -5836,7 +5836,7 @@ ZEND_VM_HANDLER(181, ZEND_FETCH_CLASS_CONSTANT, VAR|CONST|UNUSED|CLASS_FETCH, CO
58365836
}
58375837
}
58385838

5839-
zv = zend_hash_find_ex(CE_CONSTANTS_TABLE(ce), Z_STR_P(RT_CONSTANT(opline, opline->op2)), 1);
5839+
zv = zend_hash_find_known_hash(CE_CONSTANTS_TABLE(ce), Z_STR_P(RT_CONSTANT(opline, opline->op2)));
58405840
if (EXPECTED(zv != NULL)) {
58415841
c = Z_PTR_P(zv);
58425842
scope = EX(func)->op_array.scope;
@@ -7336,7 +7336,7 @@ ZEND_VM_HANDLER(57, ZEND_BEGIN_SILENCE, ANY, ANY)
73367336
/* Do not silence fatal errors */
73377337
EG(error_reporting) &= E_FATAL_ERRORS;
73387338
if (!EG(error_reporting_ini_entry)) {
7339-
zval *zv = zend_hash_find_ex(EG(ini_directives), ZSTR_KNOWN(ZEND_STR_ERROR_REPORTING), 1);
7339+
zval *zv = zend_hash_find_known_hash(EG(ini_directives), ZSTR_KNOWN(ZEND_STR_ERROR_REPORTING));
73407340
if (zv) {
73417341
EG(error_reporting_ini_entry) = (zend_ini_entry *)Z_PTR_P(zv);
73427342
} else {
@@ -7585,7 +7585,7 @@ ZEND_VM_HANDLER(145, ZEND_DECLARE_CLASS_DELAYED, CONST, CONST)
75857585
ce = CACHED_PTR(opline->extended_value);
75867586
if (ce == NULL) {
75877587
lcname = RT_CONSTANT(opline, opline->op1);
7588-
zv = zend_hash_find_ex(EG(class_table), Z_STR_P(lcname + 1), 1);
7588+
zv = zend_hash_find_known_hash(EG(class_table), Z_STR_P(lcname + 1));
75897589
if (zv) {
75907590
SAVE_OPLINE();
75917591
ce = Z_CE_P(zv);
@@ -7616,14 +7616,14 @@ ZEND_VM_HANDLER(146, ZEND_DECLARE_ANON_CLASS, ANY, ANY, CACHE_SLOT)
76167616
ce = CACHED_PTR(opline->extended_value);
76177617
if (UNEXPECTED(ce == NULL)) {
76187618
zend_string *rtd_key = Z_STR_P(RT_CONSTANT(opline, opline->op1));
7619-
zv = zend_hash_find_ex(EG(class_table), rtd_key, 1);
7619+
zv = zend_hash_find_known_hash(EG(class_table), rtd_key);
76207620
if (UNEXPECTED(zv == NULL)) {
76217621
SAVE_OPLINE();
76227622
do {
76237623
ZEND_ASSERT(EX(func)->op_array.fn_flags & ZEND_ACC_PRELOADED);
76247624
if (zend_preload_autoload
76257625
&& zend_preload_autoload(EX(func)->op_array.filename) == SUCCESS) {
7626-
zv = zend_hash_find_ex(EG(class_table), rtd_key, 1);
7626+
zv = zend_hash_find_known_hash(EG(class_table), rtd_key);
76277627
if (EXPECTED(zv != NULL)) {
76287628
break;
76297629
}
@@ -8286,7 +8286,7 @@ ZEND_VM_HOT_HANDLER(168, ZEND_BIND_GLOBAL, CV, CONST, CACHE_SLOT)
82868286
}
82878287
}
82888288

8289-
value = zend_hash_find_ex(&EG(symbol_table), varname, 1);
8289+
value = zend_hash_find_known_hash(&EG(symbol_table), varname);
82908290
if (UNEXPECTED(value == NULL)) {
82918291
value = zend_hash_add_new(&EG(symbol_table), varname, &EG(uninitialized_zval));
82928292
idx = (char*)value - (char*)EG(symbol_table).arData;
@@ -8971,7 +8971,7 @@ ZEND_VM_COLD_CONSTCONST_HANDLER(189, ZEND_IN_ARRAY, CONST|TMP|VAR|CV, CONST, NUM
89718971
if ((OP1_TYPE & (IS_VAR|IS_CV)) && Z_TYPE_P(op1) == IS_REFERENCE) {
89728972
op1 = Z_REFVAL_P(op1);
89738973
if (EXPECTED(Z_TYPE_P(op1) == IS_STRING)) {
8974-
result = zend_hash_find_ex(ht, Z_STR_P(op1), 0);
8974+
result = zend_hash_find(ht, Z_STR_P(op1));
89758975
FREE_OP1();
89768976
ZEND_VM_SMART_BRANCH(result, 0);
89778977
} else if (EXPECTED(Z_TYPE_P(op1) == IS_LONG)) {
@@ -8990,7 +8990,7 @@ ZEND_VM_COLD_CONSTCONST_HANDLER(189, ZEND_IN_ARRAY, CONST|TMP|VAR|CV, CONST, NUM
89908990
HANDLE_EXCEPTION();
89918991
}
89928992
}
8993-
result = zend_hash_find_ex(ht, ZSTR_EMPTY_ALLOC(), 1);
8993+
result = zend_hash_find_known_hash(ht, ZSTR_EMPTY_ALLOC());
89948994
ZEND_VM_SMART_BRANCH(result, 0);
89958995
} else {
89968996
zend_string *key;
@@ -8999,7 +8999,7 @@ ZEND_VM_COLD_CONSTCONST_HANDLER(189, ZEND_IN_ARRAY, CONST|TMP|VAR|CV, CONST, NUM
89998999
if ((OP1_TYPE & (IS_VAR|IS_CV)) && Z_TYPE_P(op1) == IS_REFERENCE) {
90009000
op1 = Z_REFVAL_P(op1);
90019001
if (EXPECTED(Z_TYPE_P(op1) == IS_STRING)) {
9002-
result = zend_hash_find_ex(ht, Z_STR_P(op1), 0);
9002+
result = zend_hash_find(ht, Z_STR_P(op1));
90039003
FREE_OP1();
90049004
ZEND_VM_SMART_BRANCH(result, 0);
90059005
}

0 commit comments

Comments
 (0)