archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-21 01:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove special handling of zero-arg funcs in func_info

Browse source 
In PHP 8 we always throw on zpp failure, so we can always return the
type for the valid argument case only. We'll want to also adjust the
return type listings based on that (and drop MAY_BE_NULL/MAY_BE_FALSE
where possible).
This commit is contained in:
Nikita Popov 2019-05-27 17:16:56 +02:00
parent 45c663a9d3
commit a1284b4241
1 changed files with 0 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ext/opcache/Optimizer/zend_func_info.c
View file

@ -1620,15 +1620,6 @@ uint32_t zend_get_func_info(const zend_call_info *call_info, const zend_ssa *ssa
ret = MAY_BE_NULL;
} else if (info->info_func) {
ret = info->info_func(call_info, ssa);
} else if (/*callee_func->common.arg_info && */
callee_func->common.num_args == 0 &&
callee_func->common.required_num_args == 0 &&
!(callee_func->common.fn_flags & ZEND_ACC_VARIADIC)) {
if (call_info->num_args == 0) {
ret = info->info;
} else {
ret = FUNC_MAY_WARN | MAY_BE_NULL;
}
} else {
ret = info->info;
}