Skip to content

Commit

Permalink
Properly check for array_replace_recursive in sccp.c
Browse files Browse the repository at this point in the history 
Due to a typo, this code used to check for array_merge_recursive
twice.
  • Loading branch information
@TysonAndre @krakjoe
TysonAndre authored and krakjoe committed Feb 3, 2019
1 parent 3890c8b commit cf56832
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions ext/opcache/Optimizer/sccp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,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")) {
Expand Down Expand Up @@ -800,7 +800,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")) {
Expand Down

0 comments on commit cf56832

Please sign in to comment.