Skip to content

Very minor cleanups in array_merge() #20433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 10, 2025
+6 −8
Merged

Very minor cleanups in array_merge() #20433

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d54eeec
standard: Use specialised macro in array_merge()
ndossche Nov 9, 2025
d4f76ee
standard: Use RETURN_COPY()/RETVAL_ARR() in array_merge()
ndossche Nov 9, 2025
d8c2486
standard: Use booleans in array_merge()
ndossche Nov 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions ext/standard/array.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4310,22 +4310,20 @@ static zend_always_inline void php_array_merge_wrapper(INTERNAL_FUNCTION_PARAMET
if (ret) {
if (HT_IS_PACKED(Z_ARRVAL_P(ret))) {
if (HT_IS_WITHOUT_HOLES(Z_ARRVAL_P(ret))) {
ZVAL_COPY(return_value, ret);
return;
RETURN_COPY(ret);
}
} else {
bool copy = 1;
bool copy = true;
zend_string *string_key;

ZEND_HASH_FOREACH_STR_KEY(Z_ARRVAL_P(ret), string_key) {
ZEND_HASH_MAP_FOREACH_STR_KEY(Z_ARRVAL_P(ret), string_key) {
if (!string_key) {
copy = 0;
copy = false;
break;
}
} ZEND_HASH_FOREACH_END();
if (copy) {
ZVAL_COPY(return_value, ret);
return;
RETURN_COPY(ret);
}
}
}
Expand All @@ -4340,7 +4338,7 @@ static zend_always_inline void php_array_merge_wrapper(INTERNAL_FUNCTION_PARAMET
if (HT_IS_WITHOUT_HOLES(src) && zend_may_modify_arg_in_place(arg)) {
dest = src;
in_place = true;
ZVAL_ARR(return_value, dest);
RETVAL_ARR(dest);
} else {
array_init_size(return_value, count);
dest = Z_ARRVAL_P(return_value);
Expand Down