Skip to content

ext/intl: various optimization #22069

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

Open
LamentXU123 wants to merge 4 commits into
base: master
Choose a base branch
from
+9 −9
Open

ext/intl: various optimization #22069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a28444a
ext/intl: use array_init_size for known-size arrays
LamentXU123 May 17, 2026
68cc28e
ext/intl: reuse known string lengths
LamentXU123 May 17, 2026
445ca2b
ext/intl: pre-size large ICU enumeration arrays
LamentXU123 May 17, 2026
b1261a0
ext/intl: drop disputed ICU enumeration pre-sizing
LamentXU123 May 23, 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/intl/calendar/calendar_methods.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ U_CFUNC PHP_FUNCTION(intlcal_get_available_locales)

int32_t count;
const Locale *availLocales = Calendar::getAvailableLocales(count);
array_init(return_value);
array_init_size(return_value, count);
for (int i = 0; i < count; i++) {
Locale locale = availLocales[i];
add_next_index_string(return_value, locale.getName());
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/dateformat/dateformat_parse.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ static void internal_parse_to_localtime(IntlDateFormatter_object *dfo, char* tex
INTL_METHOD_CHECK_STATUS( dfo, "Date parsing failed" );


array_init( return_value );
array_init_size( return_value, 9 );
/* Add entries from various fields of the obtained parsed_calendar */
add_to_localtime_arr( dfo, return_value, parsed_calendar, UCAL_SECOND, CALENDAR_SEC);
add_to_localtime_arr( dfo, return_value, parsed_calendar, UCAL_MINUTE, CALENDAR_MIN);
Expand Down
14 changes: 7 additions & 7 deletions ext/intl/locale/locale_methods.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ static zend_string* get_icu_value_internal( const char* loc_name , const char* t
efree( mod_loc_name);
}

tag_value->len = strlen(tag_value->val);
tag_value->len = buflen;
return tag_value;
}
/* }}} */
Expand Down Expand Up @@ -736,7 +736,7 @@ U_CFUNC PHP_FUNCTION( locale_get_keywords )
Z_PARAM_PATH(loc_name, loc_name_len)
ZEND_PARSE_PARAMETERS_END();

INTL_CHECK_LOCALE_LEN(strlen(loc_name));
INTL_CHECK_LOCALE_LEN(loc_name_len);

if(loc_name_len == 0) {
loc_name = (char *)intl_locale_get_default();
Expand Down Expand Up @@ -1127,7 +1127,7 @@ U_CFUNC PHP_FUNCTION(locale_parse)
Z_PARAM_PATH(loc_name, loc_name_len)
ZEND_PARSE_PARAMETERS_END();

INTL_CHECK_LOCALE_LEN(strlen(loc_name));
INTL_CHECK_LOCALE_LEN(loc_name_len);

if(loc_name_len == 0) {
loc_name = (char *)intl_locale_get_default();
Expand Down Expand Up @@ -1318,7 +1318,7 @@ U_CFUNC PHP_FUNCTION(locale_filter_matches)

if( token && (token==cur_lang_tag) ){
/* check if the char. after match is SEPARATOR */
chrcheck = token + (strlen(cur_loc_range));
chrcheck = token + can_loc_range->len;
if( isIDSeparator(*chrcheck) || isKeywordSeparator(*chrcheck) || isEndOfTag(*chrcheck) ){
efree( cur_lang_tag );
efree( cur_loc_range );
Expand Down Expand Up @@ -1350,14 +1350,14 @@ U_CFUNC PHP_FUNCTION(locale_filter_matches)
} /* end of if isCanonical */
else{
/* Convert to lower case for case-insensitive comparison */
cur_lang_tag = reinterpret_cast<char *>(ecalloc( 1, strlen(lang_tag ) + 1));
cur_lang_tag = reinterpret_cast<char *>(ecalloc(1, lang_tag_len + 1));

result = strToMatch( lang_tag , cur_lang_tag);
if( result == 0) {
efree( cur_lang_tag );
RETURN_FALSE;
}
cur_loc_range = reinterpret_cast<char *>(ecalloc( 1, strlen(loc_range ) + 1));
cur_loc_range = reinterpret_cast<char *>(ecalloc(1, loc_range_len + 1));
result = strToMatch( loc_range , cur_loc_range );
if( result == 0) {
efree( cur_lang_tag );
Expand All @@ -1370,7 +1370,7 @@ U_CFUNC PHP_FUNCTION(locale_filter_matches)

if( token && (token==cur_lang_tag) ){
/* check if the char. after match is SEPARATOR */
chrcheck = token + (strlen(cur_loc_range));
chrcheck = token + loc_range_len;
if( isIDSeparator(*chrcheck) || isEndOfTag(*chrcheck) ){
efree( cur_lang_tag );
efree( cur_loc_range );
Expand Down
Loading