Skip to content

ext/standard: Various minor optimizations (2026-9) #23690

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
LamentXU123 merged 5 commits into from
Sep 17, 2026
+31 −29
Merged

ext/standard: Various minor optimizations (2026-9) #23690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
730eef9
ext/standard: Optimize integer key insertion in array_change_key_case()
LamentXU123 Sep 15, 2026
661b16b
ext/standard: Use append-new insertion when parsing CSV
LamentXU123 Sep 15, 2026
0a6fa26
ext/standard: Avoid redundant hash checks in getopt()
LamentXU123 Sep 15, 2026
1ad8338
ext/standard: Use known-new keys in error_get_last()
LamentXU123 Sep 15, 2026
2b636d0
ext/standard: Preallocate stat result arrays
LamentXU123 Sep 15, 2026
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
2 changes: 1 addition & 1 deletion ext/standard/array.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4896,7 +4896,7 @@ PHP_FUNCTION(array_change_key_case)

ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(array), num_key, string_key, entry) {
if (!string_key) {
entry = zend_hash_index_update(Z_ARRVAL_P(return_value), num_key, entry);
entry = zend_hash_index_add_new(Z_ARRVAL_P(return_value), num_key, entry);
} else {
if (change_to_upper == PHP_CASE_UPPER) {
new_key = zend_string_toupper(string_key);
Expand Down
18 changes: 9 additions & 9 deletions ext/standard/basic_functions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1078,19 +1078,19 @@ PHP_FUNCTION(getopt)
if (Z_TYPE_P(args) != IS_ARRAY) {
convert_to_array(args);
}
zend_hash_next_index_insert(Z_ARRVAL_P(args), &val);
zend_hash_next_index_insert_new(Z_ARRVAL_P(args), &val);
} else {
zend_hash_index_update(Z_ARRVAL_P(return_value), opt_name_as_long, &val);
zend_hash_index_add_new(Z_ARRVAL_P(return_value), opt_name_as_long, &val);
}
} else {
/* other strings */
if ((args = zend_hash_str_find(Z_ARRVAL_P(return_value), optname, optname_len)) != NULL) {
if (Z_TYPE_P(args) != IS_ARRAY) {
convert_to_array(args);
}
zend_hash_next_index_insert(Z_ARRVAL_P(args), &val);
zend_hash_next_index_insert_new(Z_ARRVAL_P(args), &val);
} else {
zend_hash_str_add(Z_ARRVAL_P(return_value), optname, optname_len, &val);
zend_hash_str_add_new(Z_ARRVAL_P(return_value), optname, optname_len, &val);
}
}

Expand Down Expand Up @@ -1424,20 +1424,20 @@ PHP_FUNCTION(error_get_last)
array_init(return_value);

ZVAL_LONG(&tmp, PG(last_error_type));
zend_hash_update(Z_ARR_P(return_value), ZSTR_KNOWN(ZEND_STR_TYPE), &tmp);
zend_hash_add_new(Z_ARR_P(return_value), ZSTR_KNOWN(ZEND_STR_TYPE), &tmp);

ZVAL_STR_COPY(&tmp, PG(last_error_message));
zend_hash_update(Z_ARR_P(return_value), ZSTR_KNOWN(ZEND_STR_MESSAGE), &tmp);
zend_hash_add_new(Z_ARR_P(return_value), ZSTR_KNOWN(ZEND_STR_MESSAGE), &tmp);

ZVAL_STR_COPY(&tmp, PG(last_error_file));
zend_hash_update(Z_ARR_P(return_value), ZSTR_KNOWN(ZEND_STR_FILE), &tmp);
zend_hash_add_new(Z_ARR_P(return_value), ZSTR_KNOWN(ZEND_STR_FILE), &tmp);

ZVAL_LONG(&tmp, (zend_long)PG(last_error_lineno));
zend_hash_update(Z_ARR_P(return_value), ZSTR_KNOWN(ZEND_STR_LINE), &tmp);
zend_hash_add_new(Z_ARR_P(return_value), ZSTR_KNOWN(ZEND_STR_LINE), &tmp);

if (!Z_ISUNDEF(EG(last_fatal_error_backtrace))) {
ZVAL_COPY(&tmp, &EG(last_fatal_error_backtrace));
zend_hash_update(Z_ARR_P(return_value), ZSTR_KNOWN(ZEND_STR_TRACE), &tmp);
zend_hash_add_new(Z_ARR_P(return_value), ZSTR_KNOWN(ZEND_STR_TRACE), &tmp);
}
}
}
Expand Down
35 changes: 18 additions & 17 deletions ext/standard/file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1387,7 +1387,7 @@ PHPAPI void php_fstat(php_stream *stream, zval *return_value)
php_stream_statbuf stat_ssb;
zval stat_dev, stat_ino, stat_mode, stat_nlink, stat_uid, stat_gid, stat_rdev,
stat_size, stat_atime, stat_mtime, stat_ctime, stat_blksize, stat_blocks;
char *stat_sb_names[13] = {
char *stat_sb_names[] = {
"dev", "ino", "mode", "nlink", "uid", "gid", "rdev",
"size", "atime", "mtime", "ctime", "blksize", "blocks"
};
Expand All @@ -1396,7 +1396,8 @@ PHPAPI void php_fstat(php_stream *stream, zval *return_value)
RETURN_FALSE;
}

array_init(return_value);
array_init_size(return_value, 2 * (sizeof(stat_sb_names) / sizeof(*stat_sb_names)));
zend_hash_real_init_mixed(Z_ARRVAL_P(return_value));

ZVAL_LONG(&stat_dev, stat_ssb.sb.st_dev);
ZVAL_LONG(&stat_ino, stat_ssb.sb.st_ino);
Expand Down Expand Up @@ -1424,19 +1425,19 @@ PHPAPI void php_fstat(php_stream *stream, zval *return_value)
ZVAL_LONG(&stat_blocks,-1);
#endif
/* Store numeric indexes in proper order */
zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &stat_dev);
zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &stat_ino);
zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &stat_mode);
zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &stat_nlink);
zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &stat_uid);
zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &stat_gid);
zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &stat_rdev);
zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &stat_size);
zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &stat_atime);
zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &stat_mtime);
zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &stat_ctime);
zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &stat_blksize);
zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &stat_blocks);
zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), &stat_dev);
zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), &stat_ino);
zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), &stat_mode);
zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), &stat_nlink);
zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), &stat_uid);
zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), &stat_gid);
zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), &stat_rdev);
zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), &stat_size);
zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), &stat_atime);
zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), &stat_mtime);
zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), &stat_ctime);
zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), &stat_blksize);
zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), &stat_blocks);

/* Store string indexes referencing the same zval*/
zend_hash_str_add_new(Z_ARRVAL_P(return_value), stat_sb_names[0], strlen(stat_sb_names[0]), &stat_dev);
Expand Down Expand Up @@ -1903,7 +1904,7 @@ PHPAPI HashTable *php_bc_fgetcsv_empty_line(void)
HashTable *values = zend_new_array(1);
zval tmp;
ZVAL_NULL(&tmp);
zend_hash_next_index_insert(values, &tmp);
zend_hash_next_index_insert_new(values, &tmp);
return values;
}

Expand Down Expand Up @@ -2162,7 +2163,7 @@ PHPAPI HashTable *php_fgetcsv(php_stream *stream, char delimiter, char enclosure

zval z_tmp;
ZVAL_STRINGL(&z_tmp, temp, comp_end - temp);
zend_hash_next_index_insert(values, &z_tmp);
zend_hash_next_index_insert_new(values, &z_tmp);
} while (inc_len > 0);

efree(temp);
Expand Down
5 changes: 3 additions & 2 deletions ext/standard/filestat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,7 +935,8 @@ PHPAPI void php_stat(zend_string *filename, int type, zval *return_value)
};
size_t i, size_stat_sb = sizeof(stat_sb_addresses) / sizeof(*stat_sb_addresses);

array_init(return_value);
array_init_size(return_value, 2 * size_stat_sb);
zend_hash_real_init_mixed(Z_ARRVAL_P(return_value));

ZVAL_LONG(&stat_dev, stat_sb->st_dev);
ZVAL_LONG(&stat_ino, stat_sb->st_ino);
Expand Down Expand Up @@ -964,7 +965,7 @@ PHPAPI void php_stat(zend_string *filename, int type, zval *return_value)
#endif
for (i = 0; i < size_stat_sb; i++) {
/* Store numeric indexes in proper order */
zend_hash_next_index_insert(Z_ARRVAL_P(return_value), stat_sb_addresses[i]);
zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), stat_sb_addresses[i]);
}

for (i = 0; i < size_stat_sb; i++) {
Expand Down
Loading