Skip to content

Commit afc1756

Browse files
committed
Zend/zend_execute.c: Remove unused EXECUTE_DATA_CC in zend_check_string_offset()
1 parent 90bab1e commit afc1756

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Zend/zend_execute.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1635,7 +1635,7 @@ static zend_never_inline void zend_binary_assign_op_typed_prop(zend_property_inf
16351635
}
16361636
}
16371637

1638-
static zend_never_inline zend_long zend_check_string_offset(zval *dim, int type EXECUTE_DATA_DC)
1638+
static zend_never_inline zend_long zend_check_string_offset(zval *dim, int type)
16391639
{
16401640
zend_long offset;
16411641

@@ -1762,7 +1762,7 @@ static zend_never_inline void zend_assign_to_string_offset(zval *str, zval *dim,
17621762
/* The string may be destroyed while throwing the notice.
17631763
* Temporarily increase the refcount to detect this situation. */
17641764
GC_ADDREF(s);
1765-
offset = zend_check_string_offset(dim, BP_VAR_W EXECUTE_DATA_CC);
1765+
offset = zend_check_string_offset(dim, BP_VAR_W);
17661766
if (UNEXPECTED(GC_DELREF(s) == 0)) {
17671767
zend_string_efree(s);
17681768
if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
@@ -2322,7 +2322,7 @@ static ZEND_COLD void zend_binary_assign_op_dim_slow(zval *container, zval *dim
23222322
if (opline->op2_type == IS_UNUSED) {
23232323
zend_use_new_element_for_string();
23242324
} else {
2325-
zend_check_string_offset(dim, BP_VAR_RW EXECUTE_DATA_CC);
2325+
zend_check_string_offset(dim, BP_VAR_RW);
23262326
zend_wrong_string_offset_error();
23272327
}
23282328
} else {
@@ -2624,7 +2624,7 @@ static zend_always_inline void zend_fetch_dimension_address(zval *result, zval *
26242624
if (dim == NULL) {
26252625
zend_use_new_element_for_string();
26262626
} else {
2627-
zend_check_string_offset(dim, type EXECUTE_DATA_CC);
2627+
zend_check_string_offset(dim, type);
26282628
zend_wrong_string_offset_error();
26292629
}
26302630
ZVAL_UNDEF(result);

0 commit comments

Comments
 (0)