Skip to content

Commit 2bca35e

Browse files
committed
Rename support_strings to !is_list
In preparation for more behavior that depends on whether it it is a list() access. Using support_strings for that would be confusing.
1 parent 0c45096 commit 2bca35e

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Zend/zend_execute.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2295,7 +2295,7 @@ static zend_never_inline void ZEND_FASTCALL zend_fetch_dimension_address_UNSET(z
22952295
zend_fetch_dimension_address(result, container_ptr, dim, dim_type, BP_VAR_UNSET EXECUTE_DATA_CC);
22962296
}
22972297

2298-
static zend_always_inline void zend_fetch_dimension_address_read(zval *result, zval *container, zval *dim, int dim_type, int type, int support_strings, int slow EXECUTE_DATA_DC)
2298+
static zend_always_inline void zend_fetch_dimension_address_read(zval *result, zval *container, zval *dim, int dim_type, int type, int is_list, int slow EXECUTE_DATA_DC)
22992299
{
23002300
zval *retval;
23012301

@@ -2312,7 +2312,7 @@ static zend_always_inline void zend_fetch_dimension_address_read(zval *result, z
23122312
}
23132313
}
23142314
}
2315-
if (support_strings && EXPECTED(Z_TYPE_P(container) == IS_STRING)) {
2315+
if (!is_list && EXPECTED(Z_TYPE_P(container) == IS_STRING)) {
23162316
zend_long offset;
23172317

23182318
try_string_offset:
@@ -2402,30 +2402,30 @@ static zend_always_inline void zend_fetch_dimension_address_read(zval *result, z
24022402
static zend_never_inline void ZEND_FASTCALL zend_fetch_dimension_address_read_R(zval *container, zval *dim, int dim_type OPLINE_DC EXECUTE_DATA_DC)
24032403
{
24042404
zval *result = EX_VAR(opline->result.var);
2405-
zend_fetch_dimension_address_read(result, container, dim, dim_type, BP_VAR_R, 1, 0 EXECUTE_DATA_CC);
2405+
zend_fetch_dimension_address_read(result, container, dim, dim_type, BP_VAR_R, 0, 0 EXECUTE_DATA_CC);
24062406
}
24072407

24082408
static zend_never_inline void zend_fetch_dimension_address_read_R_slow(zval *container, zval *dim OPLINE_DC EXECUTE_DATA_DC)
24092409
{
24102410
zval *result = EX_VAR(opline->result.var);
2411-
zend_fetch_dimension_address_read(result, container, dim, IS_CV, BP_VAR_R, 1, 1 EXECUTE_DATA_CC);
2411+
zend_fetch_dimension_address_read(result, container, dim, IS_CV, BP_VAR_R, 0, 1 EXECUTE_DATA_CC);
24122412
}
24132413

24142414
static zend_never_inline void ZEND_FASTCALL zend_fetch_dimension_address_read_IS(zval *container, zval *dim, int dim_type OPLINE_DC EXECUTE_DATA_DC)
24152415
{
24162416
zval *result = EX_VAR(opline->result.var);
2417-
zend_fetch_dimension_address_read(result, container, dim, dim_type, BP_VAR_IS, 1, 0 EXECUTE_DATA_CC);
2417+
zend_fetch_dimension_address_read(result, container, dim, dim_type, BP_VAR_IS, 0, 0 EXECUTE_DATA_CC);
24182418
}
24192419

24202420
static zend_never_inline void ZEND_FASTCALL zend_fetch_dimension_address_LIST_r(zval *container, zval *dim, int dim_type OPLINE_DC EXECUTE_DATA_DC)
24212421
{
24222422
zval *result = EX_VAR(opline->result.var);
2423-
zend_fetch_dimension_address_read(result, container, dim, dim_type, BP_VAR_R, 0, 0 EXECUTE_DATA_CC);
2423+
zend_fetch_dimension_address_read(result, container, dim, dim_type, BP_VAR_R, 1, 0 EXECUTE_DATA_CC);
24242424
}
24252425

24262426
ZEND_API void zend_fetch_dimension_const(zval *result, zval *container, zval *dim, int type)
24272427
{
2428-
zend_fetch_dimension_address_read(result, container, dim, IS_TMP_VAR, type, 1, 0 NO_EXECUTE_DATA_CC);
2428+
zend_fetch_dimension_address_read(result, container, dim, IS_TMP_VAR, type, 0, 0 NO_EXECUTE_DATA_CC);
24292429
}
24302430

24312431
static zend_never_inline zval* ZEND_FASTCALL zend_find_array_dim_slow(HashTable *ht, zval *offset EXECUTE_DATA_DC)

0 commit comments

Comments
 (0)