Skip to content

[pull] master from php:master #557

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 2 commits into from
Jan 21, 2025
Merged

[pull] master from php:master #557

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c39d112
array_find: Remove unnecessary refcounting (#17536)
TimWolla Jan 21, 2025
1aaf2b1
array_filter: Remove unnecessary refcounting (#17538)
TimWolla Jan 21, 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
73 changes: 29 additions & 44 deletions ext/standard/array.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6556,32 +6556,25 @@ PHP_FUNCTION(array_filter)
if (!string_key) {
ZVAL_LONG(key, num_key);
} else {
ZVAL_STR_COPY(key, string_key);
ZVAL_STR(key, string_key);
}
}
if (use_type != ARRAY_FILTER_USE_KEY) {
ZVAL_COPY(&args[0], operand);
ZVAL_COPY_VALUE(&args[0], operand);
}
fci.params = args;

if (zend_call_function(&fci, &fci_cache) == SUCCESS) {
bool retval_true;
zend_result result = zend_call_function(&fci, &fci_cache);
ZEND_ASSERT(result == SUCCESS);

zval_ptr_dtor(&args[0]);
if (use_type == ARRAY_FILTER_USE_BOTH) {
zval_ptr_dtor(&args[1]);
}
retval_true = zend_is_true(&retval);
zval_ptr_dtor(&retval);
if (!retval_true) {
continue;
}
} else {
zval_ptr_dtor(&args[0]);
if (use_type == ARRAY_FILTER_USE_BOTH) {
zval_ptr_dtor(&args[1]);
}
return;
if (UNEXPECTED(EG(exception))) {
RETURN_THROWS();
}

bool retval_true = zend_is_true(&retval);
zval_ptr_dtor(&retval);
if (!retval_true) {
continue;
}
} else if (!zend_is_true(operand)) {
continue;
Expand Down Expand Up @@ -6629,42 +6622,34 @@ static zend_result php_array_find(const HashTable *array, zend_fcall_info fci, z
if (!str_key) {
ZVAL_LONG(&args[1], num_key);
} else {
ZVAL_STR_COPY(&args[1], str_key);
ZVAL_STR(&args[1], str_key);
}

ZVAL_COPY(&args[0], operand);
ZVAL_COPY_VALUE(&args[0], operand);

zend_result result = zend_call_function(&fci, &fci_cache);
if (EXPECTED(result == SUCCESS)) {
int retval_true;
ZEND_ASSERT(result == SUCCESS);

retval_true = zend_is_true(&retval);
zval_ptr_dtor(&retval);

/* This negates the condition, if negate_condition is true. Otherwise it does nothing with `retval_true`. */
retval_true ^= negate_condition;

if (retval_true) {
if (result_value != NULL) {
ZVAL_COPY_DEREF(result_value, &args[0]);
}
if (UNEXPECTED(EG(exception))) {
return FAILURE;
}

if (result_key != NULL) {
ZVAL_COPY(result_key, &args[1]);
}
bool retval_true = zend_is_true(&retval);
zval_ptr_dtor(&retval);

zval_ptr_dtor(&args[0]);
zval_ptr_dtor(&args[1]);
/* This negates the condition, if negate_condition is true. Otherwise it does nothing with `retval_true`. */
retval_true ^= negate_condition;

return SUCCESS;
if (retval_true) {
if (result_value != NULL) {
ZVAL_COPY_DEREF(result_value, &args[0]);
}
}

zval_ptr_dtor(&args[0]);
zval_ptr_dtor(&args[1]);
if (result_key != NULL) {
ZVAL_COPY(result_key, &args[1]);
}

if (UNEXPECTED(result != SUCCESS)) {
return FAILURE;
break;
}
} ZEND_HASH_FOREACH_END();

Expand Down
Loading