diff options
| author | Joe Watkins <krakjoe@php.net> | 2019-02-03 08:42:07 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2019-02-03 08:42:07 +0100 |
| commit | ed1afdd617686a8dcd1f3ab1821f4a2e3e0b1b32 (patch) | |
| tree | 6f62da34fc21ffdb436ed16051b92591c7bbf2ea /ext | |
| parent | e366ceebade0fb3c30d4f99b82a11e5fc879d22e (diff) | |
| parent | e1c93d1fb2bbf4a060de3bf630b80737ff7c6f4c (diff) | |
| download | php-git-ed1afdd617686a8dcd1f3ab1821f4a2e3e0b1b32.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Properly check for array_replace_recursive in sccp.c
Diffstat (limited to 'ext')
| -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 0eb042f5f2..eb8ffbeaf4 100644 --- a/ext/opcache/Optimizer/sccp.c +++ b/ext/opcache/Optimizer/sccp.c @@ -874,7 +874,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")) { @@ -939,7 +939,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")) { |