Skip to content

Fix #75533: array_reduce is slow when $carry is large array #2931

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

Closed
wants to merge 3 commits into from
Closed

Fix #75533: array_reduce is slow when $carry is large array #2931

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32002e7
Fix #75533: array_reduce is slow when $carry is large array
crhg Nov 22, 2017
e7c74f4
Merge remote-tracking branch 'upstream/master' into fix_array_reduce
crhg Sep 18, 2018
088431b
merge upstream changes
crhg Sep 18, 2018
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
4 changes: 2 additions & 2 deletions ext/standard/array.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5986,15 +5986,15 @@ PHP_FUNCTION(array_reduce)
ZVAL_COPY(&args[1], operand);
fci.params = args;

zval_ptr_dtor(&result);

if (zend_call_function(&fci, &fci_cache) == SUCCESS && Z_TYPE(retval) != IS_UNDEF) {
zval_ptr_dtor(&args[1]);
zval_ptr_dtor(&args[0]);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both if and else branches have these zval_ptr_dtor(&args[1]); and zval_ptr_dtor(&args[0]); lines. Can't we move out of the check to avoid duplication?

zval_ptr_dtor(&result);
ZVAL_COPY_VALUE(&result, &retval);
} else {
zval_ptr_dtor(&args[1]);
zval_ptr_dtor(&args[0]);
zval_ptr_dtor(&result);
return;
}
} ZEND_HASH_FOREACH_END();
Expand Down