Skip to content

Commit ed1afdd

Browse files
committed
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Properly check for array_replace_recursive in sccp.c
2 parents e366cee + e1c93d1 commit ed1afdd

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ext/opcache/Optimizer/sccp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -874,7 +874,7 @@ static inline int ct_eval_func_call(
874874
} else if (zend_string_equals_literal(name, "array_merge")
875875
|| zend_string_equals_literal(name, "array_replace")
876876
|| zend_string_equals_literal(name, "array_merge_recursive")
877-
|| zend_string_equals_literal(name, "array_merge_recursive")
877+
|| zend_string_equals_literal(name, "array_replace_recursive")
878878
|| zend_string_equals_literal(name, "array_diff")
879879
|| zend_string_equals_literal(name, "array_diff_assoc")
880880
|| zend_string_equals_literal(name, "array_diff_key")) {
@@ -939,7 +939,7 @@ static inline int ct_eval_func_call(
939939
} else if (zend_string_equals_literal(name, "array_merge")
940940
|| zend_string_equals_literal(name, "array_replace")
941941
|| zend_string_equals_literal(name, "array_merge_recursive")
942-
|| zend_string_equals_literal(name, "array_merge_recursive")
942+
|| zend_string_equals_literal(name, "array_replace_recursive")
943943
|| zend_string_equals_literal(name, "array_diff")
944944
|| zend_string_equals_literal(name, "array_diff_assoc")
945945
|| zend_string_equals_literal(name, "array_diff_key")) {

0 commit comments

Comments
 (0)