@@ -2525,14 +2525,8 @@ static zend_always_inline int _zend_update_type_info(
2525
2525
}
2526
2526
} else if (opline -> opcode == ZEND_ASSIGN_OBJ_OP ) {
2527
2527
if (opline -> op1_type == IS_CV ) {
2528
- if (!(orig & MAY_BE_REF )) {
2529
- if (orig & (MAY_BE_UNDEF |MAY_BE_NULL |MAY_BE_FALSE )) {
2530
- orig &= ~(MAY_BE_UNDEF |MAY_BE_NULL |MAY_BE_FALSE );
2531
- orig |= MAY_BE_OBJECT | MAY_BE_RC1 | MAY_BE_RCN ;
2532
- }
2533
- if (orig & MAY_BE_OBJECT ) {
2534
- orig |= (MAY_BE_RC1 |MAY_BE_RCN );
2535
- }
2528
+ if (orig & MAY_BE_OBJECT ) {
2529
+ orig |= (MAY_BE_RC1 |MAY_BE_RCN );
2536
2530
}
2537
2531
UPDATE_SSA_TYPE (orig , ssa_op -> op1_def );
2538
2532
COPY_SSA_OBJ_TYPE (ssa_op -> op1_use , ssa_op -> op1_def );
@@ -2741,10 +2735,6 @@ static zend_always_inline int _zend_update_type_info(
2741
2735
case ZEND_ASSIGN_OBJ :
2742
2736
if (opline -> op1_type == IS_CV ) {
2743
2737
tmp = t1 ;
2744
- if (t1 & (MAY_BE_UNDEF |MAY_BE_NULL |MAY_BE_FALSE )) {
2745
- tmp &= ~(MAY_BE_UNDEF |MAY_BE_NULL |MAY_BE_FALSE );
2746
- tmp |= MAY_BE_OBJECT | MAY_BE_RC1 | MAY_BE_RCN ;
2747
- }
2748
2738
if (tmp & MAY_BE_OBJECT ) {
2749
2739
tmp |= MAY_BE_RC1 | MAY_BE_RCN ;
2750
2740
}
@@ -2791,10 +2781,6 @@ static zend_always_inline int _zend_update_type_info(
2791
2781
case ZEND_POST_DEC_OBJ :
2792
2782
if (opline -> op1_type == IS_CV ) {
2793
2783
tmp = t1 ;
2794
- if (t1 & (MAY_BE_UNDEF |MAY_BE_NULL |MAY_BE_FALSE )) {
2795
- tmp &= ~(MAY_BE_UNDEF |MAY_BE_NULL |MAY_BE_FALSE );
2796
- tmp |= MAY_BE_OBJECT | MAY_BE_RC1 | MAY_BE_RCN ;
2797
- }
2798
2784
if (tmp & MAY_BE_OBJECT ) {
2799
2785
tmp |= MAY_BE_RC1 | MAY_BE_RCN ;
2800
2786
}
@@ -2870,10 +2856,6 @@ static zend_always_inline int _zend_update_type_info(
2870
2856
case ZEND_ASSIGN_OBJ_REF :
2871
2857
if (opline -> op1_type == IS_CV ) {
2872
2858
tmp = t1 ;
2873
- if (t1 & (MAY_BE_UNDEF |MAY_BE_NULL |MAY_BE_FALSE )) {
2874
- tmp &= ~(MAY_BE_UNDEF |MAY_BE_NULL |MAY_BE_FALSE );
2875
- tmp |= MAY_BE_OBJECT | MAY_BE_RC1 | MAY_BE_RCN ;
2876
- }
2877
2859
if (tmp & MAY_BE_OBJECT ) {
2878
2860
tmp |= MAY_BE_RC1 | MAY_BE_RCN ;
2879
2861
}
0 commit comments