php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 18:53:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove some dead code in RECV type inference

Browse Source 
We must always have arg_info corresponding to RECV.
This commit is contained in:
Nikita Popov
2020-07-30 16:53:11 +02:00
parent 28eaad0969
commit ce22cf5198
1 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/opcache/Optimizer/zend_inference.c
+6 -22
View File
@@ -3006,36 +3006,20 @@ static zend_always_inline int _zend_update_type_info(
{
/* Typehinting */
zend_func_info *func_info;
zend_arg_info *arg_info = NULL;
if (op_array->arg_info && opline->op1.num <= op_array->num_args) {
arg_info = &op_array->arg_info[opline->op1.num-1];
}
zend_arg_info *arg_info = &op_array->arg_info[opline->op1.num-1];
ce = NULL;
if (arg_info) {
tmp = zend_fetch_arg_info_type(script, arg_info, &ce);
if (ZEND_ARG_SEND_MODE(arg_info)) {
tmp |= MAY_BE_REF;
}
} else {
tmp = MAY_BE_REF|MAY_BE_RC1|MAY_BE_RCN|MAY_BE_ANY|MAY_BE_ARRAY_KEY_ANY|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF;
tmp = zend_fetch_arg_info_type(script, arg_info, &ce);
if (ZEND_ARG_SEND_MODE(arg_info)) {
tmp |= MAY_BE_REF;
}
func_info = ZEND_FUNC_INFO(op_array);
if (func_info && (int)opline->op1.num-1 < func_info->num_args) {
tmp = (tmp & (MAY_BE_RC1|MAY_BE_RCN|MAY_BE_REF)) |
(tmp & func_info->arg_info[opline->op1.num-1].info.type);
}
#if 0
/* We won't receive unused arguments */
if (ssa_vars[ssa_op->result_def].use_chain < 0 &&
ssa_vars[ssa_op->result_def].phi_use_chain == NULL &&
op_array->arg_info &&
opline->op1.num <= op_array->num_args &&
op_array->arg_info[opline->op1.num-1].class_name == NULL &&
!op_array->arg_info[opline->op1.num-1].type_hint) {
tmp = MAY_BE_UNDEF|MAY_BE_RCN;
}
#endif
UPDATE_SSA_TYPE(tmp, ssa_op->result_def);
if (func_info &&
(int)opline->op1.num-1 < func_info->num_args &&