@@ -757,7 +757,7 @@ static void zend_do_free(znode *op1) /* {{{ */
757
757
zend_op * opline = & CG (active_op_array )-> opcodes [CG (active_op_array )-> last - 1 ];
758
758
759
759
while (opline -> opcode == ZEND_END_SILENCE ||
760
- opline -> opcode == ZEND_OP_DATA ) {
760
+ opline -> opcode == ZEND_OP_DATA ) {
761
761
opline -- ;
762
762
}
763
763
@@ -821,9 +821,9 @@ static void zend_do_free(znode *op1) /* {{{ */
821
821
} else {
822
822
while (opline >= CG (active_op_array )-> opcodes ) {
823
823
if ((opline -> opcode == ZEND_FETCH_LIST_R ||
824
- opline -> opcode == ZEND_FETCH_LIST_W ) &&
825
- opline -> op1_type == IS_VAR &&
826
- opline -> op1 .var == op1 -> u .op .var ) {
824
+ opline -> opcode == ZEND_FETCH_LIST_W ) &&
825
+ opline -> op1_type == IS_VAR &&
826
+ opline -> op1 .var == op1 -> u .op .var ) {
827
827
zend_emit_op (NULL , ZEND_FREE , op1 , NULL );
828
828
return ;
829
829
}
@@ -2972,7 +2972,7 @@ static zend_op *zend_compile_simple_var_no_cv(znode *result, zend_ast *ast, uint
2972
2972
}
2973
2973
2974
2974
if (name_node .op_type == IS_CONST &&
2975
- zend_is_auto_global (Z_STR (name_node .u .constant ))) {
2975
+ zend_is_auto_global (Z_STR (name_node .u .constant ))) {
2976
2976
2977
2977
opline -> extended_value = ZEND_FETCH_GLOBAL ;
2978
2978
} else {
@@ -3992,7 +3992,7 @@ static bool zend_compile_call_common(znode *result, zend_ast *args_ast, zend_fun
3992
3992
opline -> extended_value = 0 ;
3993
3993
3994
3994
if (opline -> opcode == ZEND_NEW ) {
3995
- zend_error_noreturn (E_COMPILE_ERROR , "Cannot create Closure for new expression" );
3995
+ zend_error_noreturn (E_COMPILE_ERROR , "Cannot create Closure for new expression" );
3996
3996
}
3997
3997
3998
3998
if (opline -> opcode == ZEND_INIT_FCALL ) {
@@ -4324,7 +4324,7 @@ static zend_result zend_compile_func_cufa(znode *result, zend_ast_list *args, ze
4324
4324
zend_string * name = zend_resolve_function_name (orig_name , args -> child [1 ]-> child [0 ]-> attr , & is_fully_qualified );
4325
4325
4326
4326
if (zend_string_equals_literal_ci (name , "array_slice" )
4327
- && !zend_args_contain_unpack_or_named (list )
4327
+ && !zend_args_contain_unpack_or_named (list )
4328
4328
&& list -> children == 3
4329
4329
&& list -> child [1 ]-> kind == ZEND_AST_ZVAL ) {
4330
4330
zval * zv = zend_ast_get_zval (list -> child [1 ]);
@@ -5213,7 +5213,7 @@ static void zend_compile_call(znode *result, zend_ast *ast, uint32_t type) /* {{
5213
5213
}
5214
5214
5215
5215
if (!is_callable_convert &&
5216
- zend_try_compile_special_func (result , lcname ,
5216
+ zend_try_compile_special_func (result , lcname ,
5217
5217
zend_ast_get_list (args_ast ), fbc , type ) == SUCCESS
5218
5218
) {
5219
5219
zend_string_release_ex (lcname , 0 );
@@ -5659,7 +5659,7 @@ static bool zend_handle_loops_and_finally_ex(zend_long depth, znode *return_valu
5659
5659
opline -> op1 .var = loop_var -> var_num ;
5660
5660
opline -> extended_value = ZEND_FREE_ON_RETURN ;
5661
5661
depth -- ;
5662
- }
5662
+ }
5663
5663
}
5664
5664
return (depth == 0 );
5665
5665
}
@@ -5691,7 +5691,7 @@ static bool zend_has_finally_ex(zend_long depth) /* {{{ */
5691
5691
return 0 ;
5692
5692
} else {
5693
5693
depth -- ;
5694
- }
5694
+ }
5695
5695
}
5696
5696
return 0 ;
5697
5697
}
@@ -5875,7 +5875,7 @@ void zend_resolve_goto_label(zend_op_array *op_array, zend_op *opline) /* {{{ */
5875
5875
5876
5876
label = CT_CONSTANT_EX (op_array , opline -> op2 .constant );
5877
5877
if (CG (context ).labels == NULL ||
5878
- (dest = zend_hash_find_ptr (CG (context ).labels , Z_STR_P (label ))) == NULL
5878
+ (dest = zend_hash_find_ptr (CG (context ).labels , Z_STR_P (label ))) == NULL
5879
5879
) {
5880
5880
CG (in_compilation ) = 1 ;
5881
5881
CG (active_op_array ) = op_array ;
@@ -7013,7 +7013,7 @@ static zend_type zend_compile_single_typename(zend_ast *ast)
7013
7013
if (type_code == IS_ITERABLE ) {
7014
7014
/* Set iterable bit for BC compat during Reflection and string representation of type */
7015
7015
zend_type iterable = (zend_type ) ZEND_TYPE_INIT_CLASS_MASK (ZSTR_KNOWN (ZEND_STR_TRAVERSABLE ),
7016
- (MAY_BE_ARRAY |_ZEND_TYPE_ITERABLE_BIT ));
7016
+ (MAY_BE_ARRAY |_ZEND_TYPE_ITERABLE_BIT ));
7017
7017
return iterable ;
7018
7018
}
7019
7019
@@ -7431,9 +7431,9 @@ static void zend_compile_attributes(
7431
7431
zend_ast * el = group -> child [i ];
7432
7432
7433
7433
if (el -> child [1 ] &&
7434
- el -> child [1 ]-> kind == ZEND_AST_CALLABLE_CONVERT ) {
7435
- zend_error_noreturn (E_COMPILE_ERROR ,
7436
- "Cannot create Closure as attribute argument" );
7434
+ el -> child [1 ]-> kind == ZEND_AST_CALLABLE_CONVERT ) {
7435
+ zend_error_noreturn (E_COMPILE_ERROR ,
7436
+ "Cannot create Closure as attribute argument" );
7437
7437
}
7438
7438
7439
7439
zend_string * name = zend_resolve_class_name_ast (el -> child [0 ]);
@@ -9854,8 +9854,8 @@ ZEND_API bool zend_binary_op_produces_error(uint32_t opcode, const zval *op1, co
9854
9854
}
9855
9855
9856
9856
if (!(opcode == ZEND_ADD || opcode == ZEND_SUB || opcode == ZEND_MUL || opcode == ZEND_DIV
9857
- || opcode == ZEND_POW || opcode == ZEND_MOD || opcode == ZEND_SL || opcode == ZEND_SR
9858
- || opcode == ZEND_BW_OR || opcode == ZEND_BW_AND || opcode == ZEND_BW_XOR )) {
9857
+ || opcode == ZEND_POW || opcode == ZEND_MOD || opcode == ZEND_SL || opcode == ZEND_SR
9858
+ || opcode == ZEND_BW_OR || opcode == ZEND_BW_AND || opcode == ZEND_BW_XOR )) {
9859
9859
/* Only the numeric operations throw errors. */
9860
9860
return 0 ;
9861
9861
}
@@ -11121,11 +11121,11 @@ static void zend_compile_rope_finalize(znode *result, uint32_t rope_elements, ze
11121
11121
while (opline != init_opline ) {
11122
11122
opline -- ;
11123
11123
if (opline -> opcode == ZEND_ROPE_ADD &&
11124
- opline -> result .var == (uint32_t )-1 ) {
11124
+ opline -> result .var == (uint32_t )-1 ) {
11125
11125
opline -> op1 .var = var ;
11126
11126
opline -> result .var = var ;
11127
11127
} else if (opline -> opcode == ZEND_ROPE_INIT &&
11128
- opline -> result .var == (uint32_t )-1 ) {
11128
+ opline -> result .var == (uint32_t )-1 ) {
11129
11129
opline -> result .var = var ;
11130
11130
}
11131
11131
}
@@ -11221,8 +11221,8 @@ static void zend_compile_magic_const(znode *result, zend_ast *ast) /* {{{ */
11221
11221
}
11222
11222
11223
11223
ZEND_ASSERT (ast -> attr == T_CLASS_C &&
11224
- CG (active_class_entry ) &&
11225
- (CG (active_class_entry )-> ce_flags & ZEND_ACC_TRAIT ) != 0 );
11224
+ CG (active_class_entry ) &&
11225
+ (CG (active_class_entry )-> ce_flags & ZEND_ACC_TRAIT ) != 0 );
11226
11226
11227
11227
opline = zend_emit_op_tmp (result , ZEND_FETCH_CLASS_NAME , NULL , NULL );
11228
11228
opline -> op1 .num = ZEND_FETCH_CLASS_SELF ;
0 commit comments