Skip to content

Commit 4752aec

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: Properly check for array_replace_recursive in sccp.c
2 parents 76f8a90 + ed1afdd commit 4752aec

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
@@ -873,7 +873,7 @@ static inline int ct_eval_func_call(
873873
} else if (zend_string_equals_literal(name, "array_merge")
874874
|| zend_string_equals_literal(name, "array_replace")
875875
|| zend_string_equals_literal(name, "array_merge_recursive")
876-
|| zend_string_equals_literal(name, "array_merge_recursive")
876+
|| zend_string_equals_literal(name, "array_replace_recursive")
877877
|| zend_string_equals_literal(name, "array_diff")
878878
|| zend_string_equals_literal(name, "array_diff_assoc")
879879
|| zend_string_equals_literal(name, "array_diff_key")) {
@@ -937,7 +937,7 @@ static inline int ct_eval_func_call(
937937
} else if (zend_string_equals_literal(name, "array_merge")
938938
|| zend_string_equals_literal(name, "array_replace")
939939
|| zend_string_equals_literal(name, "array_merge_recursive")
940-
|| zend_string_equals_literal(name, "array_merge_recursive")
940+
|| zend_string_equals_literal(name, "array_replace_recursive")
941941
|| zend_string_equals_literal(name, "array_diff")
942942
|| zend_string_equals_literal(name, "array_diff_assoc")
943943
|| zend_string_equals_literal(name, "array_diff_key")) {

0 commit comments

Comments
 (0)