diff options
| author | Joe Watkins <krakjoe@php.net> | 2019-02-03 08:41:26 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2019-02-03 08:41:26 +0100 |
| commit | e1c93d1fb2bbf4a060de3bf630b80737ff7c6f4c (patch) | |
| tree | 4102b518ddf6f44fa8635e95a1199995a237a404 | |
| parent | 203a2da30ae6722689e3625ac3c787c560a791a9 (diff) | |
| parent | cf56832d000d43623248a081374f2c3a92190c83 (diff) | |
| download | php-git-e1c93d1fb2bbf4a060de3bf630b80737ff7c6f4c.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Properly check for array_replace_recursive in sccp.c
| -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 ff96db4c8d..9ebaed9c83 100644 --- a/ext/opcache/Optimizer/sccp.c +++ b/ext/opcache/Optimizer/sccp.c @@ -855,7 +855,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")) { @@ -920,7 +920,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")) { |