@@ -13011,7 +13011,7 @@ static int zend_jit_fetch_obj(zend_jit_ctx *jit,
13011
13011
ir_IF_TRUE (if_def );
13012
13012
prop_addr = ZEND_ADDR_REF_ZVAL (prop_ref );
13013
13013
if (opline -> opcode == ZEND_FETCH_OBJ_W
13014
- && (!ce || ce_is_instanceof || (ce -> ce_flags & ZEND_ACC_HAS_TYPE_HINTS ))) {
13014
+ && (!ce || ce_is_instanceof || (ce -> ce_flags & ( ZEND_ACC_HAS_TYPE_HINTS | ZEND_ACC_TRAIT ) ))) {
13015
13015
uint32_t flags = opline -> extended_value & ZEND_FETCH_OBJ_FLAGS ;
13016
13016
13017
13017
ir_ref prop_info_ref = ir_LOAD_A (
@@ -13404,7 +13404,7 @@ static int zend_jit_assign_obj(zend_jit_ctx *jit,
13404
13404
ir_IF_TRUE (if_def );
13405
13405
prop_addr = ZEND_ADDR_REF_ZVAL (prop_ref );
13406
13406
13407
- if (!ce || ce_is_instanceof || (ce -> ce_flags & ZEND_ACC_HAS_TYPE_HINTS )) {
13407
+ if (!ce || ce_is_instanceof || (ce -> ce_flags & ( ZEND_ACC_HAS_TYPE_HINTS | ZEND_ACC_TRAIT ) )) {
13408
13408
ir_ref prop_info_ref = ir_LOAD_A (
13409
13409
ir_ADD_OFFSET (run_time_cache , (opline -> extended_value & ~ZEND_FETCH_OBJ_FLAGS ) + sizeof (void * ) * 2 ));
13410
13410
ir_ref if_has_prop_info = ir_IF (prop_info_ref );
@@ -13660,7 +13660,7 @@ static int zend_jit_assign_obj_op(zend_jit_ctx *jit,
13660
13660
ir_END_list (slow_inputs );
13661
13661
13662
13662
ir_IF_TRUE (if_same );
13663
- if (!ce || ce_is_instanceof || (ce -> ce_flags & ZEND_ACC_HAS_TYPE_HINTS )) {
13663
+ if (!ce || ce_is_instanceof || (ce -> ce_flags & ( ZEND_ACC_HAS_TYPE_HINTS | ZEND_ACC_TRAIT ) )) {
13664
13664
ir_ref prop_info_ref = ir_LOAD_A (
13665
13665
ir_ADD_OFFSET (run_time_cache , ((opline + 1 )-> extended_value & ~ZEND_FETCH_OBJ_FLAGS ) + sizeof (void * ) * 2 ));
13666
13666
ir_ref if_has_prop_info = ir_IF (prop_info_ref );
@@ -14064,7 +14064,7 @@ static int zend_jit_incdec_obj(zend_jit_ctx *jit,
14064
14064
ir_END_list (slow_inputs );
14065
14065
14066
14066
ir_IF_TRUE (if_same );
14067
- if (!ce || ce_is_instanceof || (ce -> ce_flags & ZEND_ACC_HAS_TYPE_HINTS )) {
14067
+ if (!ce || ce_is_instanceof || (ce -> ce_flags & ( ZEND_ACC_HAS_TYPE_HINTS | ZEND_ACC_TRAIT ) )) {
14068
14068
ir_ref prop_info_ref = ir_LOAD_A (
14069
14069
ir_ADD_OFFSET (run_time_cache , (opline -> extended_value & ~ZEND_FETCH_OBJ_FLAGS ) + sizeof (void * ) * 2 ));
14070
14070
ir_ref if_has_prop_info = ir_IF (prop_info_ref );
0 commit comments