From cf56832d000d43623248a081374f2c3a92190c83 Mon Sep 17 00:00:00 2001 From: Tyson Andre Date: Fri, 1 Feb 2019 20:54:21 -0500 Subject: Properly check for array_replace_recursive in sccp.c Due to a typo, this code used to check for array_merge_recursive twice. --- ext/opcache/Optimizer/sccp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext') diff --git a/ext/opcache/Optimizer/sccp.c b/ext/opcache/Optimizer/sccp.c index a519196e30..78ce8e7e25 100644 --- a/ext/opcache/Optimizer/sccp.c +++ b/ext/opcache/Optimizer/sccp.c @@ -735,7 +735,7 @@ static inline int ct_eval_func_call( } else if (zend_string_equals_literal(name, "array_merge") || zend_string_equals_literal(name, "array_replace") || zend_string_equals_literal(name, "array_merge_recursive") - || zend_string_equals_literal(name, "array_merge_recursive") + || zend_string_equals_literal(name, "array_replace_recursive") || zend_string_equals_literal(name, "array_diff") || zend_string_equals_literal(name, "array_diff_assoc") || zend_string_equals_literal(name, "array_diff_key")) { @@ -800,7 +800,7 @@ static inline int ct_eval_func_call( } else if (zend_string_equals_literal(name, "array_merge") || zend_string_equals_literal(name, "array_replace") || zend_string_equals_literal(name, "array_merge_recursive") - || zend_string_equals_literal(name, "array_merge_recursive") + || zend_string_equals_literal(name, "array_replace_recursive") || zend_string_equals_literal(name, "array_diff") || zend_string_equals_literal(name, "array_diff_assoc") || zend_string_equals_literal(name, "array_diff_key")) { -- cgit v1.2.1