php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid useless initializations of fci/fcc in array functions (#18273)

Browse Source 
These cause cache misses due to global access, in phpstan
(notably the array_map).
Initializing these isn't necessary because ZPP initializes it for us.
Only for optional arguments do we need to be careful; for `array_filter`
we still reset the `fci` but not `fci_cache` because `fci` is not
necessarily set by ZPP but is conditionally used to access `fci_cache`.
This commit is contained in:
Niels Dossche
2025-04-15 23:08:12 +02:00
committed by GitHub
parent 93a3256da8
commit ea387fcfb7
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ext/standard/array.c
View File

@@ -6439,7 +6439,7 @@ PHP_FUNCTION(array_reduce)
zval args[2]; zval args[2];
zval *operand; zval *operand;
zend_fcall_info fci; zend_fcall_info fci;
zend_fcall_info_cache fci_cache = empty_fcall_info_cache; zend_fcall_info_cache fci_cache;
zval *initial = NULL; zval *initial = NULL;
HashTable *htbl; HashTable *htbl;
@@ -6515,7 +6515,7 @@ PHP_FUNCTION(array_filter)
zend_long use_type = 0; zend_long use_type = 0;
zend_string *string_key; zend_string *string_key;
zend_fcall_info fci = empty_fcall_info; zend_fcall_info fci = empty_fcall_info;
zend_fcall_info_cache fci_cache = empty_fcall_info_cache; zend_fcall_info_cache fci_cache;
zend_ulong num_key; zend_ulong num_key;
ZEND_PARSE_PARAMETERS_START(1, 3) ZEND_PARSE_PARAMETERS_START(1, 3)
@@ -6649,7 +6649,7 @@ PHP_FUNCTION(array_find)
{ {
HashTable *array; HashTable *array;
zend_fcall_info fci; zend_fcall_info fci;
zend_fcall_info_cache fci_cache = empty_fcall_info_cache; zend_fcall_info_cache fci_cache;
ZEND_PARSE_PARAMETERS_START(2, 2) ZEND_PARSE_PARAMETERS_START(2, 2)
Z_PARAM_ARRAY_HT(array) Z_PARAM_ARRAY_HT(array)
@@ -6665,7 +6665,7 @@ PHP_FUNCTION(array_find_key)
{ {
HashTable *array; HashTable *array;
zend_fcall_info fci; zend_fcall_info fci;
zend_fcall_info_cache fci_cache = empty_fcall_info_cache; zend_fcall_info_cache fci_cache;
ZEND_PARSE_PARAMETERS_START(2, 2) ZEND_PARSE_PARAMETERS_START(2, 2)
Z_PARAM_ARRAY_HT(array) Z_PARAM_ARRAY_HT(array)
@@ -6681,7 +6681,7 @@ PHP_FUNCTION(array_any)
{ {
HashTable *array; HashTable *array;
zend_fcall_info fci; zend_fcall_info fci;
zend_fcall_info_cache fci_cache = empty_fcall_info_cache; zend_fcall_info_cache fci_cache;
ZEND_PARSE_PARAMETERS_START(2, 2) ZEND_PARSE_PARAMETERS_START(2, 2)
Z_PARAM_ARRAY_HT(array) Z_PARAM_ARRAY_HT(array)
@@ -6697,7 +6697,7 @@ PHP_FUNCTION(array_all)
{ {
HashTable *array; HashTable *array;
zend_fcall_info fci; zend_fcall_info fci;
zend_fcall_info_cache fci_cache = empty_fcall_info_cache; zend_fcall_info_cache fci_cache;
ZEND_PARSE_PARAMETERS_START(2, 2) ZEND_PARSE_PARAMETERS_START(2, 2)
Z_PARAM_ARRAY_HT(array) Z_PARAM_ARRAY_HT(array)
@@ -6714,8 +6714,8 @@ PHP_FUNCTION(array_map)
zval *arrays = NULL; zval *arrays = NULL;
int n_arrays = 0; int n_arrays = 0;
zval result; zval result;
zend_fcall_info fci = empty_fcall_info; zend_fcall_info fci;
zend_fcall_info_cache fci_cache = empty_fcall_info_cache; zend_fcall_info_cache fci_cache;
int i; int i;
uint32_t k, maxlen = 0; uint32_t k, maxlen = 0;