@@ -3525,11 +3525,10 @@ uint32_t zend_compile_args(
3525
3525
}
3526
3526
3527
3527
fbc = NULL ;
3528
- memset (& arg_node , 0 , sizeof (arg_node ));
3529
- arg_node .u .op .num = arg -> attr ;
3530
3528
3531
- opline = zend_emit_op (NULL , ZEND_SEND_PLACEHOLDER , & arg_node , NULL );
3532
- opline -> op2 .opline_num = arg_num ;
3529
+ opline = zend_emit_op (NULL , ZEND_SEND_PLACEHOLDER , NULL , NULL );
3530
+ opline -> op1 .num = arg -> attr ;
3531
+ opline -> op2 .num = arg_num ;
3533
3532
opline -> result .var = EX_NUM_TO_VAR (arg_num - 1 );
3534
3533
3535
3534
* is_call_partial = true;
@@ -3742,7 +3741,7 @@ void zend_compile_call_partial(znode *result, uint32_t arg_count, bool may_have_
3742
3741
}
3743
3742
3744
3743
opline = zend_emit_op (result , ZEND_DO_FCALL_PARTIAL ,
3745
- (opline -> opcode == ZEND_NEW ) ? & op1 : NULL , NULL );
3744
+ (opline -> opcode == ZEND_NEW ) ? & op1 : NULL , NULL );
3746
3745
3747
3746
if (may_have_extra_named_args ) {
3748
3747
opline -> extended_value = ZEND_FCALL_MAY_HAVE_EXTRA_NAMED_PARAMS ;
@@ -3848,8 +3847,8 @@ static inline bool zend_args_contain_unpack_or_named_or_partial(zend_ast_list *a
3848
3847
for (i = 0 ; i < args -> children ; ++ i ) {
3849
3848
zend_ast * arg = args -> child [i ];
3850
3849
if (arg -> kind == ZEND_AST_UNPACK ||
3851
- arg -> kind == ZEND_AST_NAMED_ARG ||
3852
- arg -> kind == ZEND_AST_PLACEHOLDER_ARG ) {
3850
+ arg -> kind == ZEND_AST_NAMED_ARG ||
3851
+ arg -> kind == ZEND_AST_PLACEHOLDER_ARG ) {
3853
3852
return 1 ;
3854
3853
}
3855
3854
}
0 commit comments