@@ -2476,10 +2476,7 @@ static inline zend_bool zend_is_unticked_stmt(zend_ast *ast) /* {{{ */
2476
2476
2477
2477
static inline zend_bool zend_can_write_to_variable (zend_ast * ast ) /* {{{ */
2478
2478
{
2479
- while (
2480
- ast -> kind == ZEND_AST_DIM
2481
- || ast -> kind == ZEND_AST_PROP
2482
- ) {
2479
+ while (ast -> kind == ZEND_AST_DIM || ast -> kind == ZEND_AST_PROP ) {
2483
2480
ast = ast -> child [0 ];
2484
2481
}
2485
2482
@@ -2806,7 +2803,6 @@ static zend_op *zend_delayed_compile_prop(znode *result, zend_ast *ast, uint32_t
2806
2803
}
2807
2804
2808
2805
zend_adjust_for_fetch_type (opline , result , type );
2809
-
2810
2806
return opline ;
2811
2807
}
2812
2808
/* }}} */
@@ -3045,6 +3041,7 @@ void zend_compile_assign(znode *result, zend_ast *ast) /* {{{ */
3045
3041
znode var_node , expr_node ;
3046
3042
zend_op * opline ;
3047
3043
uint32_t offset ;
3044
+
3048
3045
if (is_this_fetch (var_ast )) {
3049
3046
zend_error_noreturn (E_COMPILE_ERROR , "Cannot re-assign $this" );
3050
3047
}
@@ -4326,7 +4323,6 @@ void zend_compile_static_call(znode *result, zend_ast *ast, uint32_t type) /* {{
4326
4323
zend_compile_class_ref (& class_node , class_ast , ZEND_FETCH_CLASS_EXCEPTION );
4327
4324
4328
4325
zend_compile_expr (& method_node , method_ast );
4329
-
4330
4326
if (method_node .op_type == IS_CONST ) {
4331
4327
zval * name = & method_node .u .constant ;
4332
4328
if (Z_TYPE_P (name ) != IS_STRING ) {
@@ -8015,7 +8011,6 @@ void zend_compile_binary_op(znode *result, zend_ast *ast) /* {{{ */
8015
8011
uint32_t opcode = ast -> attr ;
8016
8012
8017
8013
znode left_node , right_node ;
8018
-
8019
8014
zend_compile_expr (& left_node , left_ast );
8020
8015
zend_compile_expr (& right_node , right_ast );
8021
8016
@@ -8232,7 +8227,7 @@ void zend_compile_post_incdec(znode *result, zend_ast *ast) /* {{{ */
8232
8227
8233
8228
zend_ensure_writable_variable (var_ast );
8234
8229
8235
- if (var_ast -> kind == ZEND_AST_PROP || var_ast -> kind == ZEND_AST_NULLSAFE_PROP ) {
8230
+ if (var_ast -> kind == ZEND_AST_PROP ) {
8236
8231
zend_op * opline = zend_compile_prop (NULL , var_ast , BP_VAR_RW , 0 );
8237
8232
opline -> opcode = ast -> kind == ZEND_AST_POST_INC ? ZEND_POST_INC_OBJ : ZEND_POST_DEC_OBJ ;
8238
8233
zend_make_tmp_result (result , opline );
@@ -8256,7 +8251,7 @@ void zend_compile_pre_incdec(znode *result, zend_ast *ast) /* {{{ */
8256
8251
8257
8252
zend_ensure_writable_variable (var_ast );
8258
8253
8259
- if (var_ast -> kind == ZEND_AST_PROP || var_ast -> kind == ZEND_AST_NULLSAFE_PROP ) {
8254
+ if (var_ast -> kind == ZEND_AST_PROP ) {
8260
8255
zend_op * opline = zend_compile_prop (result , var_ast , BP_VAR_RW , 0 );
8261
8256
opline -> opcode = ast -> kind == ZEND_AST_PRE_INC ? ZEND_PRE_INC_OBJ : ZEND_PRE_DEC_OBJ ;
8262
8257
opline -> result_type = IS_TMP_VAR ;
0 commit comments