Skip to content

Commit e1c93d1

Browse files
committed
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2: Properly check for array_replace_recursive in sccp.c
2 parents 203a2da + cf56832 commit e1c93d1

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
@@ -855,7 +855,7 @@ static inline int ct_eval_func_call(
855855
} else if (zend_string_equals_literal(name, "array_merge")
856856
|| zend_string_equals_literal(name, "array_replace")
857857
|| zend_string_equals_literal(name, "array_merge_recursive")
858-
|| zend_string_equals_literal(name, "array_merge_recursive")
858+
|| zend_string_equals_literal(name, "array_replace_recursive")
859859
|| zend_string_equals_literal(name, "array_diff")
860860
|| zend_string_equals_literal(name, "array_diff_assoc")
861861
|| zend_string_equals_literal(name, "array_diff_key")) {
@@ -920,7 +920,7 @@ static inline int ct_eval_func_call(
920920
} else if (zend_string_equals_literal(name, "array_merge")
921921
|| zend_string_equals_literal(name, "array_replace")
922922
|| zend_string_equals_literal(name, "array_merge_recursive")
923-
|| zend_string_equals_literal(name, "array_merge_recursive")
923+
|| zend_string_equals_literal(name, "array_replace_recursive")
924924
|| zend_string_equals_literal(name, "array_diff")
925925
|| zend_string_equals_literal(name, "array_diff_assoc")
926926
|| zend_string_equals_literal(name, "array_diff_key")) {

0 commit comments

Comments
 (0)