Skip to content

Commit 6056217

Browse files
committed
Split expression
1 parent 3074cbf commit 6056217

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

Zend/zend_execute.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3612,7 +3612,12 @@ static zend_never_inline zend_result zend_fetch_static_property_address_ex(zval
36123612
static zend_always_inline zend_result zend_fetch_static_property_address(zval **retval, zend_property_info **prop_info, uint32_t cache_slot, int fetch_type, int flags OPLINE_DC EXECUTE_DATA_DC) {
36133613
zend_property_info *property_info;
36143614

3615-
if (opline->op1_type == IS_CONST && (opline->op2_type == IS_CONST || (opline->op2_type == IS_UNUSED && (opline->op2.num == ZEND_FETCH_CLASS_SELF || opline->op2.num == ZEND_FETCH_CLASS_PARENT))) && EXPECTED(CACHED_PTR(cache_slot) != NULL)) {
3615+
if (opline->op1_type == IS_CONST
3616+
&& (opline->op2_type == IS_CONST
3617+
|| (opline->op2_type == IS_UNUSED
3618+
&& (opline->op2.num == ZEND_FETCH_CLASS_SELF
3619+
|| opline->op2.num == ZEND_FETCH_CLASS_PARENT)))
3620+
&& EXPECTED(CACHED_PTR(cache_slot) != NULL)) {
36163621
*retval = CACHED_PTR(cache_slot + sizeof(void *));
36173622
property_info = CACHED_PTR(cache_slot + sizeof(void *) * 2);
36183623

0 commit comments

Comments
 (0)