Skip to content

ext/spl: convert zend_parse_parameters_none() to fast ZPP #20441

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 1 commit into from
Nov 10, 2025
+115 −345
Merged

ext/spl: convert zend_parse_parameters_none() to fast ZPP #20441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 2 additions & 6 deletions ext/spl/php_spl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,9 +216,7 @@ PHP_FUNCTION(class_uses)
/* {{{ Return an array containing the names of all classes and interfaces defined in SPL */
PHP_FUNCTION(spl_classes)
{
if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

array_init(return_value);

Expand Down Expand Up @@ -619,9 +617,7 @@ PHP_FUNCTION(spl_autoload_functions)
{
autoload_func_info *alfi;

if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

array_init(return_value);
if (spl_autoload_functions) {
Expand Down
60 changes: 15 additions & 45 deletions ext/spl/spl_array.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,9 +753,7 @@ PHP_METHOD(ArrayObject, getArrayCopy)
zval *object = ZEND_THIS;
spl_array_object *intern = Z_SPLARRAY_P(object);

if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

RETURN_ARR(zend_array_dup(spl_array_get_hash_table(intern)));
} /* }}} */
Expand Down Expand Up @@ -1086,9 +1084,7 @@ PHP_METHOD(ArrayObject, getIteratorClass)
zval *object = ZEND_THIS;
spl_array_object *intern = Z_SPLARRAY_P(object);

if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

zend_string_addref(intern->ce_get_iterator->name);
RETURN_STR(intern->ce_get_iterator->name);
Expand All @@ -1101,9 +1097,7 @@ PHP_METHOD(ArrayObject, getFlags)
zval *object = ZEND_THIS;
spl_array_object *intern = Z_SPLARRAY_P(object);

if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

RETURN_LONG(intern->ar_flags & ~SPL_ARRAY_INT_MASK);
}
Expand Down Expand Up @@ -1150,9 +1144,7 @@ PHP_METHOD(ArrayObject, getIterator)
zval *object = ZEND_THIS;
spl_array_object *intern = Z_SPLARRAY_P(object);

if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

RETURN_OBJ(spl_array_object_new_ex(intern->ce_get_iterator, Z_OBJ_P(object), 0));
}
Expand Down Expand Up @@ -1203,9 +1195,7 @@ PHP_METHOD(ArrayObject, count)
{
spl_array_object *intern = Z_SPLARRAY_P(ZEND_THIS);

if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

RETURN_LONG(spl_array_object_count_elements_helper(intern));
} /* }}} */
Expand Down Expand Up @@ -1305,9 +1295,7 @@ PHP_METHOD(ArrayObject, serialize)
php_serialize_data_t var_hash;
smart_str buf = {0};

if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

PHP_VAR_SERIALIZE_INIT(var_hash);

Expand Down Expand Up @@ -1453,9 +1441,7 @@ PHP_METHOD(ArrayObject, __serialize)
spl_array_object *intern = Z_SPLARRAY_P(ZEND_THIS);
zval tmp;

if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

array_init(return_value);

Expand Down Expand Up @@ -1559,9 +1545,7 @@ PHP_METHOD(ArrayObject, __unserialize)
/* {{{ */
PHP_METHOD(ArrayObject, __debugInfo)
{
if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

RETURN_ARR(spl_array_get_debug_info(Z_OBJ_P(ZEND_THIS)));
} /* }}} */
Expand Down Expand Up @@ -1739,9 +1723,7 @@ PHP_METHOD(ArrayIterator, rewind)
zval *object = ZEND_THIS;
spl_array_object *intern = Z_SPLARRAY_P(object);

if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

spl_array_rewind(intern);
}
Expand Down Expand Up @@ -1783,9 +1765,7 @@ PHP_METHOD(ArrayIterator, current)
zval *entry;
HashTable *aht = spl_array_get_hash_table(intern);

if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

if ((entry = zend_hash_get_current_data_ex(aht, spl_array_get_pos_ptr(aht, intern))) == NULL) {
RETURN_NULL();
Expand All @@ -1812,9 +1792,7 @@ void spl_array_iterator_key(zval *object, zval *return_value) /* {{{ */
/* {{{ Return current array key */
PHP_METHOD(ArrayIterator, key)
{
if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

spl_array_iterator_key(ZEND_THIS, return_value);
} /* }}} */
Expand All @@ -1826,9 +1804,7 @@ PHP_METHOD(ArrayIterator, next)
spl_array_object *intern = Z_SPLARRAY_P(object);
HashTable *aht = spl_array_get_hash_table(intern);

if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

spl_array_next_ex(intern, aht);
}
Expand All @@ -1841,9 +1817,7 @@ PHP_METHOD(ArrayIterator, valid)
spl_array_object *intern = Z_SPLARRAY_P(object);
HashTable *aht = spl_array_get_hash_table(intern);

if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

RETURN_BOOL(zend_hash_has_more_elements_ex(aht, spl_array_get_pos_ptr(aht, intern)) == SUCCESS);
}
Expand All @@ -1858,9 +1832,7 @@ PHP_METHOD(RecursiveArrayIterator, hasChildren)
spl_array_object *intern = Z_SPLARRAY_P(object);
HashTable *aht = spl_array_get_hash_table(intern);

if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

if ((entry = zend_hash_get_current_data_ex(aht, spl_array_get_pos_ptr(aht, intern))) == NULL) {
RETURN_FALSE;
Expand Down Expand Up @@ -1898,9 +1870,7 @@ PHP_METHOD(RecursiveArrayIterator, getChildren)
spl_array_object *intern = Z_SPLARRAY_P(object);
HashTable *aht = spl_array_get_hash_table(intern);

if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

if ((entry = zend_hash_get_current_data_ex(aht, spl_array_get_pos_ptr(aht, intern))) == NULL) {
RETURN_NULL();
Expand Down
Loading