From f12e6a076fe7aa1f7a19eebb9152af2e78ef734a Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Fri, 7 Dec 2018 19:21:26 +0300 Subject: [PATCH] Reorder conditions --- Zend/zend_compile.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 41a01e12a66..f08e6ecd1e5 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -443,9 +443,8 @@ static int lookup_cv(zend_string *name) /* {{{ */{ zend_ulong hash_value = zend_string_hash_val(name); while (i < op_array->last_var) { - if (ZSTR_VAL(op_array->vars[i]) == ZSTR_VAL(name) || - (ZSTR_H(op_array->vars[i]) == hash_value && - zend_string_equal_content(op_array->vars[i], name))) { + if (ZSTR_H(op_array->vars[i]) == hash_value + && zend_string_equals(op_array->vars[i], name)) { return (int)(zend_intptr_t)ZEND_CALL_VAR_NUM(NULL, i); } i++;