diff options
| author | Tyson Andre <tysonandre775@hotmail.com> | 2019-02-01 20:54:21 -0500 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2019-02-03 08:40:21 +0100 |
| commit | cf56832d000d43623248a081374f2c3a92190c83 (patch) | |
| tree | 7e8b398cf5e13f9fc00dae05327d4a7dbcea45e1 | |
| parent | 3890c8bce5f46c59d7c57e2c2ea10d2cc8b44ce1 (diff) | |
| download | php-git-cf56832d000d43623248a081374f2c3a92190c83.tar.gz | |
Properly check for array_replace_recursive in sccp.c
Due to a typo, this code used to check for array_merge_recursive
twice.
| -rw-r--r-- | ext/opcache/Optimizer/sccp.c | 4 |
1 files changed, 2 insertions, 2 deletions
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")) { |