Skip to content

Commit 6b073cc

Browse files
committed
Revert unused changes
1 parent 9480c89 commit 6b073cc

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

Zend/zend_compile.c

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2476,10 +2476,7 @@ static inline zend_bool zend_is_unticked_stmt(zend_ast *ast) /* {{{ */
24762476

24772477
static inline zend_bool zend_can_write_to_variable(zend_ast *ast) /* {{{ */
24782478
{
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) {
24832480
ast = ast->child[0];
24842481
}
24852482

@@ -2806,7 +2803,6 @@ static zend_op *zend_delayed_compile_prop(znode *result, zend_ast *ast, uint32_t
28062803
}
28072804

28082805
zend_adjust_for_fetch_type(opline, result, type);
2809-
28102806
return opline;
28112807
}
28122808
/* }}} */
@@ -3045,6 +3041,7 @@ void zend_compile_assign(znode *result, zend_ast *ast) /* {{{ */
30453041
znode var_node, expr_node;
30463042
zend_op *opline;
30473043
uint32_t offset;
3044+
30483045
if (is_this_fetch(var_ast)) {
30493046
zend_error_noreturn(E_COMPILE_ERROR, "Cannot re-assign $this");
30503047
}
@@ -4326,7 +4323,6 @@ void zend_compile_static_call(znode *result, zend_ast *ast, uint32_t type) /* {{
43264323
zend_compile_class_ref(&class_node, class_ast, ZEND_FETCH_CLASS_EXCEPTION);
43274324

43284325
zend_compile_expr(&method_node, method_ast);
4329-
43304326
if (method_node.op_type == IS_CONST) {
43314327
zval *name = &method_node.u.constant;
43324328
if (Z_TYPE_P(name) != IS_STRING) {
@@ -8015,7 +8011,6 @@ void zend_compile_binary_op(znode *result, zend_ast *ast) /* {{{ */
80158011
uint32_t opcode = ast->attr;
80168012

80178013
znode left_node, right_node;
8018-
80198014
zend_compile_expr(&left_node, left_ast);
80208015
zend_compile_expr(&right_node, right_ast);
80218016

@@ -8232,7 +8227,7 @@ void zend_compile_post_incdec(znode *result, zend_ast *ast) /* {{{ */
82328227

82338228
zend_ensure_writable_variable(var_ast);
82348229

8235-
if (var_ast->kind == ZEND_AST_PROP || var_ast->kind == ZEND_AST_NULLSAFE_PROP) {
8230+
if (var_ast->kind == ZEND_AST_PROP) {
82368231
zend_op *opline = zend_compile_prop(NULL, var_ast, BP_VAR_RW, 0);
82378232
opline->opcode = ast->kind == ZEND_AST_POST_INC ? ZEND_POST_INC_OBJ : ZEND_POST_DEC_OBJ;
82388233
zend_make_tmp_result(result, opline);
@@ -8256,7 +8251,7 @@ void zend_compile_pre_incdec(znode *result, zend_ast *ast) /* {{{ */
82568251

82578252
zend_ensure_writable_variable(var_ast);
82588253

8259-
if (var_ast->kind == ZEND_AST_PROP || var_ast->kind == ZEND_AST_NULLSAFE_PROP) {
8254+
if (var_ast->kind == ZEND_AST_PROP) {
82608255
zend_op *opline = zend_compile_prop(result, var_ast, BP_VAR_RW, 0);
82618256
opline->opcode = ast->kind == ZEND_AST_PRE_INC ? ZEND_PRE_INC_OBJ : ZEND_PRE_DEC_OBJ;
82628257
opline->result_type = IS_TMP_VAR;

0 commit comments

Comments
 (0)