com php-src: Updated reference-counting inferece rules. The previous rules refected PHP-5 behavior and were completely wrong for PHP-7. (e.g. scalars
don't have reference counters at all). This change shouldn't affect anything, because results of this inference are not used yet.:
ext/opcache/Optimizer/zend_dfg.c ext/opcache/Optimizer/ze nd_func_info.c ext/opcache/Optimizer/zend_inference .c
ext/opcache/Optimizer/zend_inference.h ext/opcache /Optimiz

From: Date: Thu, 06 Oct 2016 08:08:01 +0000
Subject: com php-src: Updated reference-counting inferece rules. The previous rules refected PHP-5 behavior and were completely wrong for PHP-7. (e.g. scalars
don't have reference counters at all). This change shouldn't affect anything, because results of this inference are not used yet.:
ext/opcache/Optimizer/zend_dfg.c ext/opcache/Optimizer/ze nd_func_info.c ext/opcache/Optimizer/zend_inference .c
ext/opcache/Optimizer/zend_inference.h ext/opcache /Optimiz
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-94849@lists.php.net to get a copy of this message
Commit: b2d53e47ed0a141078c41331d4c232db979be967 Author: Dmitry Stogov <dmitry@zend.com> Thu, 6 Oct 2016 11:08:01 +0300 Parents: 50059639c86a10fe11d6ec3eec2e690ee77afccc Branches: PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b2d53e47ed0a141078c41331d4c232db979be967 Log: Updated reference-counting inferece rules. The previous rules refected PHP-5 behavior and were completely wrong for PHP-7. (e.g. scalars don't have reference counters at all). This change shouldn't affect anything, because results of this inference are not used yet. Changed paths: M ext/opcache/Optimizer/zend_dfg.c M ext/opcache/Optimizer/zend_func_info.c M ext/opcache/Optimizer/zend_inference.c M ext/opcache/Optimizer/zend_inference.h M ext/opcache/Optimizer/zend_ssa.c

diff --git a/ext/opcache/Optimizer/zend_dfg.c b/ext/opcache/Optimizer/zend_dfg.c index 1fc42e8..693fcc8 100644 --- a/ext/opcache/Optimizer/zend_dfg.c +++ b/ext/opcache/Optimizer/zend_dfg.c @@ -74,6 +74,8 @@ int zend_build_dfg(const zend_op_array *op_array, const zend_cfg *cfg, zend_dfg } goto op1_use; case ZEND_FE_RESET_R: + case ZEND_SEND_VAR: + case ZEND_CAST: if (build_flags & ZEND_SSA_RC_INFERENCE) { goto op1_def; } diff --git a/ext/opcache/Optimizer/zend_func_info.c b/ext/opcache/Optimizer/zend_func_info.c index 0e4e444..40fddd80 100644 --- a/ext/opcache/Optimizer/zend_func_info.c +++ b/ext/opcache/Optimizer/zend_func_info.c @@ -38,7 +38,7 @@ typedef struct _func_info_t { } func_info_t; #define F0(name, info) \ - {name, sizeof(name)-1, (info), NULL} + {name, sizeof(name)-1, (FUNC_MAY_WARN | (info)), NULL} #define F1(name, info) \ {name, sizeof(name)-1, (FUNC_MAY_WARN | MAY_BE_RC1 | (info)), NULL} #define FN(name, info) \ @@ -47,8 +47,12 @@ typedef struct _func_info_t { {name, sizeof(name)-1, (FUNC_MAY_WARN | MAY_BE_REF | (info)), NULL} #define FX(name, info) \ {name, sizeof(name)-1, (FUNC_MAY_WARN | MAY_BE_RC1 | MAY_BE_RCN | MAY_BE_REF | (info)), NULL} +#define I0(name, info) \ + {name, sizeof(name)-1, (info), NULL} #define I1(name, info) \ {name, sizeof(name)-1, (MAY_BE_RC1 | (info)), NULL} +#define IN(name, info) \ + {name, sizeof(name)-1, (MAY_BE_RC1 | MAY_BE_RCN | (info)), NULL} #define FC(name, callback) \ {name, sizeof(name)-1, 0, callback} @@ -57,7 +61,7 @@ static uint32_t zend_strlen_info(const zend_call_info *call_info, const zend_ssa if (call_info->caller_init_opline->extended_value == (uint32_t)call_info->num_args && call_info->num_args == 1) { - uint32_t tmp = MAY_BE_RC1; + uint32_t tmp = 0; if (call_info->arg_info[0].opline) { uint32_t arg_info = _ssa_op1_info(call_info->caller_op_array, ssa, call_info->arg_info[0].opline); @@ -78,7 +82,7 @@ static uint32_t zend_strlen_info(const zend_call_info *call_info, const zend_ssa return tmp; } else { /* warning, and returns NULL */ - return FUNC_MAY_WARN | MAY_BE_RC1 | MAY_BE_NULL; + return FUNC_MAY_WARN | MAY_BE_NULL; } } @@ -89,7 +93,7 @@ static uint32_t zend_dechex_info(const zend_call_info *call_info, const zend_ssa return MAY_BE_RC1 | MAY_BE_STRING; } else { /* warning, and returns NULL */ - return FUNC_MAY_WARN | MAY_BE_RC1 | MAY_BE_NULL; + return FUNC_MAY_WARN | MAY_BE_NULL; } } @@ -130,9 +134,9 @@ static uint32_t zend_is_type_info(const zend_call_info *call_info, const zend_ss { if (call_info->caller_init_opline->extended_value == (uint32_t)call_info->num_args && call_info->num_args == 1) { - return MAY_BE_RC1 | MAY_BE_FALSE | MAY_BE_TRUE | FUNC_MAY_INLINE; + return MAY_BE_FALSE | MAY_BE_TRUE | FUNC_MAY_INLINE; } else { - return MAY_BE_RC1 | MAY_BE_FALSE | MAY_BE_TRUE | FUNC_MAY_WARN; + return MAY_BE_FALSE | MAY_BE_TRUE | FUNC_MAY_WARN; } } @@ -143,7 +147,7 @@ static uint32_t zend_l_ss_info(const zend_call_info *call_info, const zend_ssa * uint32_t arg1_info = _ssa_op1_info(call_info->caller_op_array, ssa, call_info->arg_info[0].opline); uint32_t arg2_info = _ssa_op1_info(call_info->caller_op_array, ssa, call_info->arg_info[1].opline); - uint32_t tmp = MAY_BE_RC1; + uint32_t tmp = 0; if ((arg1_info & (MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_STRING|MAY_BE_OBJECT)) && (arg2_info & (MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_STRING|MAY_BE_OBJECT))) { @@ -157,7 +161,7 @@ static uint32_t zend_l_ss_info(const zend_call_info *call_info, const zend_ssa * return tmp; } else { /* warning, and returns NULL */ - return FUNC_MAY_WARN | MAY_BE_RC1 | MAY_BE_NULL | MAY_BE_LONG; + return FUNC_MAY_WARN | MAY_BE_NULL | MAY_BE_LONG; } } @@ -168,7 +172,7 @@ static uint32_t zend_lb_ssn_info(const zend_call_info *call_info, const zend_ssa uint32_t arg1_info = _ssa_op1_info(call_info->caller_op_array, ssa, call_info->arg_info[0].opline); uint32_t arg2_info = _ssa_op1_info(call_info->caller_op_array, ssa, call_info->arg_info[1].opline); uint32_t arg3_info = _ssa_op1_info(call_info->caller_op_array, ssa, call_info->arg_info[2].opline); - uint32_t tmp = MAY_BE_RC1; + uint32_t tmp = 0; if ((arg1_info & (MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_STRING|MAY_BE_OBJECT)) && (arg2_info & (MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_STRING|MAY_BE_OBJECT)) && @@ -184,7 +188,7 @@ static uint32_t zend_lb_ssn_info(const zend_call_info *call_info, const zend_ssa return tmp; } else { /* warning, and returns NULL */ - return FUNC_MAY_WARN | MAY_BE_RC1 | MAY_BE_NULL | MAY_BE_LONG; + return FUNC_MAY_WARN | MAY_BE_NULL | MAY_BE_LONG; } } @@ -194,7 +198,7 @@ static uint32_t zend_b_s_info(const zend_call_info *call_info, const zend_ssa *s call_info->num_args == 1) { uint32_t arg1_info = _ssa_op1_info(call_info->caller_op_array, ssa, call_info->arg_info[0].opline); - uint32_t tmp = MAY_BE_RC1; + uint32_t tmp = 0; if (arg1_info & (MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_STRING|MAY_BE_OBJECT)) { tmp |= MAY_BE_FALSE | MAY_BE_TRUE; @@ -206,7 +210,7 @@ static uint32_t zend_b_s_info(const zend_call_info *call_info, const zend_ssa *s return tmp; } else { /* warning, and returns NULL */ - return FUNC_MAY_WARN | MAY_BE_RC1 | MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE; + return FUNC_MAY_WARN | MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE; } } @@ -215,12 +219,12 @@ static uint32_t zend_b_s_info(const zend_call_info *call_info, const zend_ssa *s static const func_info_t func_infos[] = { /* zend */ I1("zend_version", MAY_BE_STRING), - I1("gc_collect_cycles", MAY_BE_LONG), - I1("gc_enabled", MAY_BE_FALSE | MAY_BE_TRUE), - F1("gc_enable", MAY_BE_NULL), - F1("gc_disable", MAY_BE_NULL), - F1("func_num_args", MAY_BE_LONG), - F1("func_get_arg", UNKNOWN_INFO), + I0("gc_collect_cycles", MAY_BE_LONG), + I0("gc_enabled", MAY_BE_FALSE | MAY_BE_TRUE), + F0("gc_enable", MAY_BE_NULL), + F0("gc_disable", MAY_BE_NULL), + F0("func_num_args", MAY_BE_LONG), + FN("func_get_arg", UNKNOWN_INFO), F1("func_get_args", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF), FC("strlen", zend_strlen_info), FC("strcmp", zend_l_ss_info), @@ -228,29 +232,29 @@ static const func_info_t func_infos[] = { FC("strcasecmp", zend_l_ss_info), FC("strncasecmp", zend_lb_ssn_info), F1("each", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_KEY_ANY), - F1("error_reporting", MAY_BE_NULL | MAY_BE_LONG), - F1("define", MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_NULL), // TODO: inline + F0("error_reporting", MAY_BE_NULL | MAY_BE_LONG), + F0("define", MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_NULL), // TODO: inline FC("defined", zend_b_s_info), // TODO: inline - F1("get_class", MAY_BE_FALSE | MAY_BE_STRING), - F1("get_called_class", MAY_BE_FALSE | MAY_BE_STRING), - F1("get_parrent_class", MAY_BE_FALSE | MAY_BE_STRING), - F1("is_subclass_of", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), // TODO: inline - F1("is_a", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), // TODO: inline + FN("get_class", MAY_BE_FALSE | MAY_BE_STRING), + FN("get_called_class", MAY_BE_FALSE | MAY_BE_STRING), + FN("get_parrent_class", MAY_BE_FALSE | MAY_BE_STRING), + F0("is_subclass_of", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), // TODO: inline + F0("is_a", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), // TODO: inline F1("get_class_vars", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF), F1("get_object_vars", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF), F1("get_class_methods", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), - F1("method_exists", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("property_exists", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("class_exists", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("interface_exists", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("trait_exists", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("method_exists", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("property_exists", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("class_exists", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("interface_exists", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("trait_exists", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), FC("function_exists", zend_b_s_info), // TODO: inline - F1("class_alias", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("class_alias", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("get_included_files", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), - F1("trigger_error", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("user_error", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("set_error_handler", MAY_BE_NULL | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_OBJECT | MAY_BE_OBJECT), - I1("restore_error_handler", MAY_BE_NULL | MAY_BE_TRUE), + F0("trigger_error", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("user_error", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + FN("set_error_handler", MAY_BE_NULL | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_OBJECT | MAY_BE_OBJECT), + I0("restore_error_handler", MAY_BE_NULL | MAY_BE_TRUE), F1("get_declared_traits", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), F1("get_declared_classes", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), F1("get_declared_interfaces", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), @@ -259,26 +263,26 @@ static const func_info_t func_infos[] = { F1("create_function", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_STRING), F1("get_resource_type", MAY_BE_NULL | MAY_BE_STRING), F1("get_defined_constants", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_NULL | MAY_BE_ARRAY_OF_FALSE | MAY_BE_ARRAY_OF_TRUE | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_DOUBLE | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_RESOURCE | MAY_BE_ARRAY_OF_ARRAY), - F1("debug_print_backtrace", MAY_BE_NULL), + F0("debug_print_backtrace", MAY_BE_NULL), F1("debug_backtrace", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_ARRAY), F1("get_loaded_extensions", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), FC("extension_loaded", zend_b_s_info), F1("get_extension_funcs", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), /* ext/statdard */ - F1("constant", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_LONG | MAY_BE_DOUBLE | MAY_BE_STRING | MAY_BE_RESOURCE), + FN("constant", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_LONG | MAY_BE_DOUBLE | MAY_BE_STRING | MAY_BE_RESOURCE), F1("bin2hex", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("hex2bin", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("sleep", MAY_BE_FALSE | MAY_BE_LONG), - F1("usleep", MAY_BE_NULL | MAY_BE_FALSE), + F0("sleep", MAY_BE_FALSE | MAY_BE_LONG), + F0("usleep", MAY_BE_NULL | MAY_BE_FALSE), #if HAVE_NANOSLEEP - F1("time_nanosleep", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("time_sleep_until", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("time_nanosleep", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("time_sleep_until", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), #endif #if HAVE_STRPTIME F1("strptime", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING), #endif - F1("flush", MAY_BE_NULL), + F0("flush", MAY_BE_NULL), F1("wordwrap", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("htmlspecialchars", MAY_BE_NULL | MAY_BE_STRING), F1("htmlentities", MAY_BE_NULL | MAY_BE_STRING), @@ -289,32 +293,32 @@ static const func_info_t func_infos[] = { F1("sha1_file", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("md5", MAY_BE_NULL | MAY_BE_STRING), F1("md5_file", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("crc32", MAY_BE_NULL | MAY_BE_LONG), + F0("crc32", MAY_BE_NULL | MAY_BE_LONG), F1("iptcparse", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ARRAY), F1("iptcembed", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("getimagesize", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING), F1("getimagesizefromstring", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING), F1("image_type_to_mime_type", MAY_BE_NULL | MAY_BE_STRING), F1("image_type_to_extension", MAY_BE_FALSE | MAY_BE_STRING), - F1("phpinfo", MAY_BE_NULL | MAY_BE_TRUE), + F0("phpinfo", MAY_BE_NULL | MAY_BE_TRUE), F1("phpversion", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("phpcredits", MAY_BE_NULL | MAY_BE_TRUE), + F0("phpcredits", MAY_BE_NULL | MAY_BE_TRUE), F1("php_sapi_name", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("php_uname", MAY_BE_NULL | MAY_BE_STRING), F1("php_ini_scanned_files", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("php_ini_loaded_file", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("strnatcmp", MAY_BE_NULL | MAY_BE_LONG), - F1("strnatcasecmp", MAY_BE_NULL | MAY_BE_LONG), - F1("substr_count", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("strspn", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("strcspn", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("strnatcmp", MAY_BE_NULL | MAY_BE_LONG), + F0("strnatcasecmp", MAY_BE_NULL | MAY_BE_LONG), + F0("substr_count", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("strspn", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("strcspn", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), F1("strtok", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("strtoupper", MAY_BE_NULL | MAY_BE_STRING), - F1("strtolower", MAY_BE_NULL | MAY_BE_STRING), - F1("strpos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("stripos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("strrpos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("strripos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + FN("strtoupper", MAY_BE_NULL | MAY_BE_STRING), + FN("strtolower", MAY_BE_NULL | MAY_BE_STRING), + F0("strpos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("stripos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("strrpos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("strripos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), F1("strrev", MAY_BE_NULL | MAY_BE_STRING), F1("hebrev", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("hebrevc", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), @@ -331,55 +335,55 @@ static const func_info_t func_infos[] = { F1("str_word_count", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), F1("str_split", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), F1("strpbrk", MAY_BE_FALSE | MAY_BE_STRING), - F1("substr_compare", MAY_BE_FALSE | MAY_BE_LONG), + F0("substr_compare", MAY_BE_FALSE | MAY_BE_LONG), #ifdef HAVE_STRCOLL - F1("strcoll", MAY_BE_NULL | MAY_BE_LONG), + F0("strcoll", MAY_BE_NULL | MAY_BE_LONG), #endif #ifdef HAVE_STRFMON F1("money_format", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), #endif F1("substr", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("substr_replace", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING), + FN("substr_replace", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING), F1("quotemeta", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("ucfirst", MAY_BE_NULL | MAY_BE_STRING), F1("lcfirst", MAY_BE_NULL | MAY_BE_STRING), F1("ucwords", MAY_BE_NULL | MAY_BE_STRING), F1("strtr", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("addslashes", MAY_BE_NULL | MAY_BE_STRING), + FN("addslashes", MAY_BE_NULL | MAY_BE_STRING), F1("addcslashes", MAY_BE_NULL | MAY_BE_STRING), - F1("rtrim", MAY_BE_NULL | MAY_BE_STRING), - F1("str_replace", MAY_BE_NULL | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY | MAY_BE_ARRAY_OF_OBJECT), - F1("str_ireplace", MAY_BE_NULL | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY | MAY_BE_ARRAY_OF_OBJECT), + FN("rtrim", MAY_BE_NULL | MAY_BE_STRING), + FN("str_replace", MAY_BE_NULL | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY | MAY_BE_ARRAY_OF_OBJECT), + FN("str_ireplace", MAY_BE_NULL | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY | MAY_BE_ARRAY_OF_OBJECT), F1("str_repeat", MAY_BE_NULL | MAY_BE_STRING), F1("count_chars", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_LONG), F1("chunk_split", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("trim", MAY_BE_NULL | MAY_BE_STRING), - F1("ltrim", MAY_BE_NULL | MAY_BE_STRING), + FN("trim", MAY_BE_NULL | MAY_BE_STRING), + FN("ltrim", MAY_BE_NULL | MAY_BE_STRING), F1("strip_tags", MAY_BE_NULL | MAY_BE_STRING), - F1("similar_text", MAY_BE_NULL | MAY_BE_LONG), + F0("similar_text", MAY_BE_NULL | MAY_BE_LONG), F1("explode", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), F1("implode", MAY_BE_NULL | MAY_BE_STRING), F1("join", MAY_BE_NULL | MAY_BE_STRING), - F1("setlocale", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), + FN("setlocale", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("localeconv", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY), #if HAVE_NL_LANGINFO F1("nl_langinfo", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), #endif F1("soundex", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("levenshtein", MAY_BE_NULL | MAY_BE_LONG), + F0("levenshtein", MAY_BE_NULL | MAY_BE_LONG), F1("chr", MAY_BE_NULL | MAY_BE_STRING), - F1("ord", MAY_BE_NULL | MAY_BE_LONG), - F1("parse_str", MAY_BE_NULL), + F0("ord", MAY_BE_NULL | MAY_BE_LONG), + F0("parse_str", MAY_BE_NULL), F1("str_getcsv", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_NULL | MAY_BE_ARRAY_OF_STRING), F1("str_pad", MAY_BE_NULL | MAY_BE_STRING), F1("chop", MAY_BE_NULL | MAY_BE_STRING), F1("strchr", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("sprintf", MAY_BE_FALSE | MAY_BE_STRING), - F1("printf", MAY_BE_FALSE | MAY_BE_LONG), - F1("vprintf", MAY_BE_FALSE | MAY_BE_LONG), + F0("printf", MAY_BE_FALSE | MAY_BE_LONG), + F0("vprintf", MAY_BE_FALSE | MAY_BE_LONG), F1("vsprintf", MAY_BE_FALSE | MAY_BE_STRING), - F1("fprintf", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("vfprintf", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("fprintf", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("vfprintf", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), F1("sscanf", MAY_BE_NULL | MAY_BE_LONG | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_ANY), F1("fscanf", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_ANY), F1("parse_url", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_LONG), @@ -390,11 +394,11 @@ static const func_info_t func_infos[] = { F1("http_build_query", MAY_BE_FALSE | MAY_BE_STRING), #if defined(HAVE_SYMLINK) || defined(PHP_WIN32) F1("readlink", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("linkinfo", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("symlink", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("link", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("linkinfo", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("symlink", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("link", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), #endif - F1("unlink", MAY_BE_FALSE | MAY_BE_TRUE), + F0("unlink", MAY_BE_FALSE | MAY_BE_TRUE), F1("exec", MAY_BE_FALSE | MAY_BE_STRING), F1("system", MAY_BE_FALSE | MAY_BE_STRING), F1("escapeshellcmd", MAY_BE_NULL | MAY_BE_STRING), @@ -403,95 +407,95 @@ static const func_info_t func_infos[] = { F1("shell_exec", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), #ifdef PHP_CAN_SUPPORT_PROC_OPEN F1("proc_open", MAY_BE_FALSE | MAY_BE_RESOURCE), - F1("proc_close", MAY_BE_FALSE | MAY_BE_LONG), - F1("proc_terminate", MAY_BE_FALSE | MAY_BE_TRUE), + F0("proc_close", MAY_BE_FALSE | MAY_BE_LONG), + F0("proc_terminate", MAY_BE_FALSE | MAY_BE_TRUE), F1("proc_get_status", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_FALSE | MAY_BE_ARRAY_OF_TRUE | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING), #endif #ifdef HAVE_NICE - F1("proc_nice", MAY_BE_FALSE | MAY_BE_TRUE), + F0("proc_nice", MAY_BE_FALSE | MAY_BE_TRUE), #endif - F1("rand", MAY_BE_NULL | MAY_BE_LONG), - F1("srand", MAY_BE_NULL), - F1("getrandmax", MAY_BE_NULL | MAY_BE_LONG), - F1("mt_rand", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("mt_srand", MAY_BE_NULL), - F1("mt_getrandmax", MAY_BE_NULL | MAY_BE_LONG), + F0("rand", MAY_BE_NULL | MAY_BE_LONG), + F0("srand", MAY_BE_NULL), + F0("getrandmax", MAY_BE_NULL | MAY_BE_LONG), + F0("mt_rand", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("mt_srand", MAY_BE_NULL), + F0("mt_getrandmax", MAY_BE_NULL | MAY_BE_LONG), #if HAVE_GETSERVBYNAME - F1("getservbyname", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("getservbyname", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), #endif #if HAVE_GETSERVBYPORT F1("getservbyport", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), #endif #if HAVE_GETPROTOBYNAME - F1("getprotobyname", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("getprotobyname", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), #endif #if HAVE_GETPROTOBYNUMBER F1("getprotobynumber", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), #endif - F1("getmyuid", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("getmygid", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("getmypid", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("getmyinode", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("getlastmod", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("getmyuid", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("getmygid", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("getmypid", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("getmyinode", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("getlastmod", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), F1("base64_decode", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("base64_encode", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("password_hash", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("password_get_info", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY), - F1("password_needs_rehash", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("password_verify", MAY_BE_FALSE | MAY_BE_TRUE), + F0("password_needs_rehash", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("password_verify", MAY_BE_FALSE | MAY_BE_TRUE), F1("convert_uuencode", MAY_BE_FALSE | MAY_BE_STRING), F1("convert_uudecode", MAY_BE_FALSE | MAY_BE_STRING), - F1("abs", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_DOUBLE), - F1("ceil", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_DOUBLE), - F1("floor", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_DOUBLE), - F1("round", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_DOUBLE), - F1("sin", MAY_BE_NULL | MAY_BE_DOUBLE), - F1("cos", MAY_BE_NULL | MAY_BE_DOUBLE), - F1("tan", MAY_BE_NULL | MAY_BE_DOUBLE), - F1("asin", MAY_BE_NULL | MAY_BE_DOUBLE), - F1("acos", MAY_BE_NULL | MAY_BE_DOUBLE), - F1("atan", MAY_BE_NULL | MAY_BE_DOUBLE), - F1("atanh", MAY_BE_NULL | MAY_BE_DOUBLE), - F1("atan2", MAY_BE_NULL | MAY_BE_DOUBLE), - F1("sinh", MAY_BE_NULL | MAY_BE_DOUBLE), - F1("cosh", MAY_BE_NULL | MAY_BE_DOUBLE), - F1("tanh", MAY_BE_NULL | MAY_BE_DOUBLE), - F1("asinh", MAY_BE_NULL | MAY_BE_DOUBLE), - F1("acosh", MAY_BE_NULL | MAY_BE_DOUBLE), - F1("expm1", MAY_BE_NULL | MAY_BE_DOUBLE), - F1("log1p", MAY_BE_NULL | MAY_BE_DOUBLE), - F1("pi", MAY_BE_DOUBLE), - F1("is_finite", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("is_nan", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("is_infinite", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("pow", MAY_BE_NULL | MAY_BE_LONG | MAY_BE_DOUBLE), - F1("exp", MAY_BE_NULL | MAY_BE_DOUBLE), - F1("log", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_DOUBLE), - F1("log10", MAY_BE_NULL | MAY_BE_DOUBLE), - F1("sqrt", MAY_BE_NULL | MAY_BE_DOUBLE), - F1("hypot", MAY_BE_NULL | MAY_BE_DOUBLE), - F1("deg2rad", MAY_BE_NULL | MAY_BE_DOUBLE), - F1("rad2deg", MAY_BE_NULL | MAY_BE_DOUBLE), - F1("bindec", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_DOUBLE), - F1("hexdec", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_DOUBLE), - F1("octdec", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_DOUBLE), + F0("abs", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_DOUBLE), + F0("ceil", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_DOUBLE), + F0("floor", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_DOUBLE), + F0("round", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_DOUBLE), + F0("sin", MAY_BE_NULL | MAY_BE_DOUBLE), + F0("cos", MAY_BE_NULL | MAY_BE_DOUBLE), + F0("tan", MAY_BE_NULL | MAY_BE_DOUBLE), + F0("asin", MAY_BE_NULL | MAY_BE_DOUBLE), + F0("acos", MAY_BE_NULL | MAY_BE_DOUBLE), + F0("atan", MAY_BE_NULL | MAY_BE_DOUBLE), + F0("atanh", MAY_BE_NULL | MAY_BE_DOUBLE), + F0("atan2", MAY_BE_NULL | MAY_BE_DOUBLE), + F0("sinh", MAY_BE_NULL | MAY_BE_DOUBLE), + F0("cosh", MAY_BE_NULL | MAY_BE_DOUBLE), + F0("tanh", MAY_BE_NULL | MAY_BE_DOUBLE), + F0("asinh", MAY_BE_NULL | MAY_BE_DOUBLE), + F0("acosh", MAY_BE_NULL | MAY_BE_DOUBLE), + F0("expm1", MAY_BE_NULL | MAY_BE_DOUBLE), + F0("log1p", MAY_BE_NULL | MAY_BE_DOUBLE), + F0("pi", MAY_BE_DOUBLE), + F0("is_finite", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("is_nan", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("is_infinite", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("pow", MAY_BE_NULL | MAY_BE_LONG | MAY_BE_DOUBLE), + F0("exp", MAY_BE_NULL | MAY_BE_DOUBLE), + F0("log", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_DOUBLE), + F0("log10", MAY_BE_NULL | MAY_BE_DOUBLE), + F0("sqrt", MAY_BE_NULL | MAY_BE_DOUBLE), + F0("hypot", MAY_BE_NULL | MAY_BE_DOUBLE), + F0("deg2rad", MAY_BE_NULL | MAY_BE_DOUBLE), + F0("rad2deg", MAY_BE_NULL | MAY_BE_DOUBLE), + F0("bindec", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_DOUBLE), + F0("hexdec", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_DOUBLE), + F0("octdec", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_DOUBLE), F1("decbin", MAY_BE_NULL | MAY_BE_STRING), F1("decoct", MAY_BE_NULL | MAY_BE_STRING), FC("dechex", zend_dechex_info), F1("base_convert", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("number_format", MAY_BE_NULL | MAY_BE_STRING), - F1("fmod", MAY_BE_NULL | MAY_BE_DOUBLE), + F0("fmod", MAY_BE_NULL | MAY_BE_DOUBLE), #ifdef HAVE_INET_NTOP F1("inet_ntop", MAY_BE_FALSE | MAY_BE_STRING), #endif #ifdef HAVE_INET_PTON F1("inet_pton", MAY_BE_FALSE | MAY_BE_STRING), #endif - F1("ip2long", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("ip2long", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), F1("long2ip", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("getenv", MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING), #ifdef HAVE_PUTENV - F1("putenv", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("putenv", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), #endif F1("getopt", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_FALSE | MAY_BE_ARRAY_OF_TRUE | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY), #ifdef HAVE_GETLOADAVG @@ -511,32 +515,32 @@ static const func_info_t func_infos[] = { F1("quoted_printable_encode", MAY_BE_NULL | MAY_BE_STRING), F1("convert_cyr_string", MAY_BE_NULL | MAY_BE_STRING), F1("get_current_user", MAY_BE_NULL | MAY_BE_STRING), - F1("set_time_limit", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("header_register_callback", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("set_time_limit", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("header_register_callback", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("get_cfg_var", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY), - F1("magic_quotes_runtime", MAY_BE_NULL | MAY_BE_FALSE), - F1("set_magic_quotes_runtime", MAY_BE_NULL | MAY_BE_FALSE), - F1("get_magic_quotes_gpc", MAY_BE_NULL | MAY_BE_FALSE), - F1("get_magic_quotes_runtime", MAY_BE_NULL | MAY_BE_FALSE), - F1("error_log", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("magic_quotes_runtime", MAY_BE_NULL | MAY_BE_FALSE), + F0("set_magic_quotes_runtime", MAY_BE_NULL | MAY_BE_FALSE), + F0("get_magic_quotes_gpc", MAY_BE_NULL | MAY_BE_FALSE), + F0("get_magic_quotes_runtime", MAY_BE_NULL | MAY_BE_FALSE), + F0("error_log", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("error_get_last", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING), - F1("call_user_func", UNKNOWN_INFO), - F1("call_user_func_array", UNKNOWN_INFO), - F1("call_user_method", UNKNOWN_INFO), - F1("call_user_method_array", UNKNOWN_INFO), - F1("forward_static_call", UNKNOWN_INFO), - F1("forward_static_call_array", UNKNOWN_INFO), + FN("call_user_func", UNKNOWN_INFO), + FN("call_user_func_array", UNKNOWN_INFO), + FN("call_user_method", UNKNOWN_INFO), + FN("call_user_method_array", UNKNOWN_INFO), + FN("forward_static_call", UNKNOWN_INFO), + FN("forward_static_call_array", UNKNOWN_INFO), F1("serialize", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), FN("unserialize", UNKNOWN_INFO), - F1("var_dump", MAY_BE_NULL), + F0("var_dump", MAY_BE_NULL), F1("var_export", MAY_BE_NULL | MAY_BE_STRING), - F1("debug_zval_dump", MAY_BE_NULL), + F0("debug_zval_dump", MAY_BE_NULL), F1("print_r", MAY_BE_FALSE | MAY_BE_STRING), - F1("memory_get_usage", MAY_BE_FALSE | MAY_BE_LONG), - F1("memory_get_peak_usage", MAY_BE_FALSE | MAY_BE_LONG), - F1("register_shutdown_function", MAY_BE_NULL | MAY_BE_FALSE), - F1("register_tick_function", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("unregister_tick_function", MAY_BE_NULL), + F0("memory_get_usage", MAY_BE_FALSE | MAY_BE_LONG), + F0("memory_get_peak_usage", MAY_BE_FALSE | MAY_BE_LONG), + F0("register_shutdown_function", MAY_BE_NULL | MAY_BE_FALSE), + F0("register_tick_function", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("unregister_tick_function", MAY_BE_NULL), F1("highlight_file", MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_STRING), F1("show_source", MAY_BE_FALSE | MAY_BE_STRING), F1("highlight_string", MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_STRING), @@ -545,27 +549,27 @@ static const func_info_t func_infos[] = { F1("ini_get_all", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_NULL | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY), F1("ini_set", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("ini_alter", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("ini_restore", MAY_BE_NULL), + F0("ini_restore", MAY_BE_NULL), F1("get_include_path", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("set_include_path", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("restore_include_path", MAY_BE_NULL), - F1("setcookie", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("setrawcookie", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("header", MAY_BE_NULL), - F1("header_remove", MAY_BE_NULL), - F1("headers_sent", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("restore_include_path", MAY_BE_NULL), + F0("setcookie", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("setrawcookie", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("header", MAY_BE_NULL), + F0("header_remove", MAY_BE_NULL), + F0("headers_sent", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("headers_list", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), - F1("http_response_code", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("connection_aborted", MAY_BE_LONG), - F1("connection_status", MAY_BE_LONG), - F1("ignore_user_abort", MAY_BE_NULL | MAY_BE_LONG), + F0("http_response_code", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("connection_aborted", MAY_BE_LONG), + F0("connection_status", MAY_BE_LONG), + F0("ignore_user_abort", MAY_BE_NULL | MAY_BE_LONG), F1("parse_ini_file", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_NULL | MAY_BE_ARRAY_OF_FALSE | MAY_BE_ARRAY_OF_TRUE | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_DOUBLE | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY), F1("parse_ini_string", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_NULL | MAY_BE_ARRAY_OF_FALSE | MAY_BE_ARRAY_OF_TRUE | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_DOUBLE | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY), #if ZEND_DEBUG F1("config_get_hash", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY), #endif - F1("is_uploaded_file", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("move_uploaded_file", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("is_uploaded_file", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("move_uploaded_file", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("gethostbyaddr", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("gethostbyname", MAY_BE_NULL | MAY_BE_STRING), F1("gethostbynamel", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), @@ -573,23 +577,23 @@ static const func_info_t func_infos[] = { F1("gethostname", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), #endif #if defined(PHP_WIN32) || (HAVE_DNS_SEARCH_FUNC && !(defined(__BEOS__) || defined(NETWARE))) - F1("dns_check_record", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("checkdnsrr", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("dns_check_record", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("checkdnsrr", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), # if defined(PHP_WIN32) || HAVE_FULL_DNS_FUNCS - F1("dns_get_mx", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("getmxrr", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("dns_get_mx", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("getmxrr", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("dns_get_record", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_ARRAY), # endif #endif - F1("intval", MAY_BE_NULL | MAY_BE_LONG), - F1("floatval", MAY_BE_NULL | MAY_BE_DOUBLE), - F1("doubleval", MAY_BE_NULL | MAY_BE_DOUBLE), - F1("strval", MAY_BE_NULL | MAY_BE_STRING), - F1("boolval", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("intval", MAY_BE_NULL | MAY_BE_LONG), + F0("floatval", MAY_BE_NULL | MAY_BE_DOUBLE), + F0("doubleval", MAY_BE_NULL | MAY_BE_DOUBLE), + FN("strval", MAY_BE_NULL | MAY_BE_STRING), + F0("boolval", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("gettype", MAY_BE_NULL | MAY_BE_STRING), - F1("settype", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("settype", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), FC("is_null", zend_is_type_info), - F1("is_resource", MAY_BE_FALSE | MAY_BE_TRUE), // TODO: inline with support for closed resources + F0("is_resource", MAY_BE_FALSE | MAY_BE_TRUE), // TODO: inline with support for closed resources FC("is_bool", zend_is_type_info), FC("is_long", zend_is_type_info), FC("is_float", zend_is_type_info), @@ -597,100 +601,100 @@ static const func_info_t func_infos[] = { FC("is_integer", zend_is_type_info), FC("is_double", zend_is_type_info), FC("is_real", zend_is_type_info), - F1("is_numeric", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("is_numeric", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), FC("is_string", zend_is_type_info), FC("is_array", zend_is_type_info), - F1("is_object", MAY_BE_FALSE | MAY_BE_TRUE), // TODO: inline with support for incomplete class - F1("is_scalar", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("is_callable", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("pclose", MAY_BE_FALSE | MAY_BE_LONG), + F0("is_object", MAY_BE_FALSE | MAY_BE_TRUE), // TODO: inline with support for incomplete class + F0("is_scalar", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("is_callable", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("pclose", MAY_BE_FALSE | MAY_BE_LONG), F1("popen", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE), - F1("readfile", MAY_BE_FALSE | MAY_BE_LONG), - F1("rewind", MAY_BE_FALSE | MAY_BE_TRUE), - F1("rmdir", MAY_BE_FALSE | MAY_BE_TRUE), - F1("umask", MAY_BE_FALSE | MAY_BE_LONG), - F1("fclose", MAY_BE_FALSE | MAY_BE_TRUE), - F1("feof", MAY_BE_FALSE | MAY_BE_TRUE), + F0("readfile", MAY_BE_FALSE | MAY_BE_LONG), + F0("rewind", MAY_BE_FALSE | MAY_BE_TRUE), + F0("rmdir", MAY_BE_FALSE | MAY_BE_TRUE), + F0("umask", MAY_BE_FALSE | MAY_BE_LONG), + F0("fclose", MAY_BE_FALSE | MAY_BE_TRUE), + F0("feof", MAY_BE_FALSE | MAY_BE_TRUE), F1("fgetc", MAY_BE_FALSE | MAY_BE_STRING), F1("fgets", MAY_BE_FALSE | MAY_BE_STRING), F1("fgetss", MAY_BE_FALSE | MAY_BE_STRING), F1("fread", MAY_BE_FALSE | MAY_BE_STRING), F1("fopen", MAY_BE_FALSE | MAY_BE_RESOURCE), - F1("fpassthru", MAY_BE_FALSE | MAY_BE_LONG), - F1("ftruncate", MAY_BE_FALSE | MAY_BE_TRUE), + F0("fpassthru", MAY_BE_FALSE | MAY_BE_LONG), + F0("ftruncate", MAY_BE_FALSE | MAY_BE_TRUE), F1("fstat", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_LONG), - F1("fseek", MAY_BE_FALSE | MAY_BE_LONG), - F1("ftell", MAY_BE_FALSE | MAY_BE_LONG), - F1("fflush", MAY_BE_FALSE | MAY_BE_TRUE), - F1("fwrite", MAY_BE_FALSE | MAY_BE_LONG), - F1("fputs", MAY_BE_FALSE | MAY_BE_LONG), - F1("mkdir", MAY_BE_FALSE | MAY_BE_TRUE), - F1("rename", MAY_BE_FALSE | MAY_BE_TRUE), - F1("copy", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("fseek", MAY_BE_FALSE | MAY_BE_LONG), + F0("ftell", MAY_BE_FALSE | MAY_BE_LONG), + F0("fflush", MAY_BE_FALSE | MAY_BE_TRUE), + F0("fwrite", MAY_BE_FALSE | MAY_BE_LONG), + F0("fputs", MAY_BE_FALSE | MAY_BE_LONG), + F0("mkdir", MAY_BE_FALSE | MAY_BE_TRUE), + F0("rename", MAY_BE_FALSE | MAY_BE_TRUE), + F0("copy", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("tempnam", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("tmpfile", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE), F1("file", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), F1("file_get_contents", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("file_put_contents", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("stream_select", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("file_put_contents", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("stream_select", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), F1("stream_context_create", MAY_BE_FALSE | MAY_BE_RESOURCE), - F1("stream_context_set_params", MAY_BE_FALSE | MAY_BE_TRUE), + F0("stream_context_set_params", MAY_BE_FALSE | MAY_BE_TRUE), F1("stream_context_get_params", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ANY), - F1("stream_context_set_option", MAY_BE_FALSE | MAY_BE_TRUE), + F0("stream_context_set_option", MAY_BE_FALSE | MAY_BE_TRUE), F1("stream_context_get_options", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ANY), - F1("stream_context_get_default", MAY_BE_FALSE | MAY_BE_RESOURCE), - F1("stream_context_set_default", MAY_BE_FALSE | MAY_BE_RESOURCE), + FN("stream_context_get_default", MAY_BE_FALSE | MAY_BE_RESOURCE), + FN("stream_context_set_default", MAY_BE_FALSE | MAY_BE_RESOURCE), F1("stream_filter_prepend", MAY_BE_FALSE | MAY_BE_RESOURCE), F1("stream_filter_append", MAY_BE_FALSE | MAY_BE_RESOURCE), - F1("stream_filter_remove", MAY_BE_FALSE | MAY_BE_TRUE), + F0("stream_filter_remove", MAY_BE_FALSE | MAY_BE_TRUE), F1("stream_socket_client", MAY_BE_FALSE | MAY_BE_RESOURCE), F1("stream_socket_server", MAY_BE_FALSE | MAY_BE_RESOURCE), F1("stream_socket_accept", MAY_BE_FALSE | MAY_BE_RESOURCE), F1("stream_socket_get_name", MAY_BE_FALSE | MAY_BE_STRING), F1("stream_socket_recvfrom", MAY_BE_FALSE | MAY_BE_STRING), - F1("stream_socket_sendto", MAY_BE_FALSE | MAY_BE_LONG), - F1("stream_socket_enable_crypto", MAY_BE_FALSE | MAY_BE_LONG), + F0("stream_socket_sendto", MAY_BE_FALSE | MAY_BE_LONG), + F0("stream_socket_enable_crypto", MAY_BE_FALSE | MAY_BE_LONG), #ifdef HAVE_SHUTDOWN - F1("stream_socket_shutdown", MAY_BE_FALSE | MAY_BE_TRUE), + F0("stream_socket_shutdown", MAY_BE_FALSE | MAY_BE_TRUE), #endif #if HAVE_SOCKETPAIR F1("stream_socket_pair", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_RESOURCE), #endif - F1("stream_copy_to_stream", MAY_BE_FALSE | MAY_BE_LONG), + F0("stream_copy_to_stream", MAY_BE_FALSE | MAY_BE_LONG), F1("stream_get_contents", MAY_BE_FALSE | MAY_BE_STRING), - F1("stream_supports_lock", MAY_BE_FALSE | MAY_BE_TRUE), + F0("stream_supports_lock", MAY_BE_FALSE | MAY_BE_TRUE), F1("fgetcsv", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_NULL | MAY_BE_ARRAY_OF_STRING), - F1("fputcsv", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("flock", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("fputcsv", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("flock", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("get_meta_tags", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING), - F1("stream_set_read_buffer", MAY_BE_FALSE | MAY_BE_LONG), - F1("stream_set_write_buffer", MAY_BE_FALSE | MAY_BE_LONG), - F1("set_file_buffer", MAY_BE_FALSE | MAY_BE_LONG), - F1("stream_set_chunk_size", MAY_BE_FALSE | MAY_BE_LONG), - F1("set_socket_blocking", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("stream_set_blocking", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("socket_set_blocking", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("stream_set_read_buffer", MAY_BE_FALSE | MAY_BE_LONG), + F0("stream_set_write_buffer", MAY_BE_FALSE | MAY_BE_LONG), + F0("set_file_buffer", MAY_BE_FALSE | MAY_BE_LONG), + F0("stream_set_chunk_size", MAY_BE_FALSE | MAY_BE_LONG), + F0("set_socket_blocking", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("stream_set_blocking", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("socket_set_blocking", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("stream_get_meta_data", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ANY), F1("stream_get_line", MAY_BE_FALSE | MAY_BE_STRING), - F1("stream_wrapper_register", MAY_BE_FALSE | MAY_BE_TRUE), - F1("stream_register_wrapper", MAY_BE_FALSE | MAY_BE_TRUE), - F1("stream_wrapper_unregister", MAY_BE_FALSE | MAY_BE_TRUE), - F1("stream_wrapper_restore", MAY_BE_FALSE | MAY_BE_TRUE), + F0("stream_wrapper_register", MAY_BE_FALSE | MAY_BE_TRUE), + F0("stream_register_wrapper", MAY_BE_FALSE | MAY_BE_TRUE), + F0("stream_wrapper_unregister", MAY_BE_FALSE | MAY_BE_TRUE), + F0("stream_wrapper_restore", MAY_BE_FALSE | MAY_BE_TRUE), F1("stream_get_wrappers", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), F1("stream_get_transports", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), F1("stream_resolve_include_path", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("stream_is_local", MAY_BE_FALSE | MAY_BE_TRUE), + F0("stream_is_local", MAY_BE_FALSE | MAY_BE_TRUE), F1("get_headers", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY), #if HAVE_SYS_TIME_H || defined(PHP_WIN32) - F1("stream_set_timeout", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("socket_set_timeout", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("stream_set_timeout", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("socket_set_timeout", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), #endif F1("socket_get_status", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ANY), #if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS) F1("realpath", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), #endif #ifdef HAVE_FNMATCH - F1("fnmatch", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("fnmatch", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), #endif F1("fsockopen", MAY_BE_FALSE | MAY_BE_RESOURCE), F1("pfsockopen", MAY_BE_FALSE | MAY_BE_RESOURCE), @@ -699,115 +703,115 @@ static const func_info_t func_infos[] = { F1("get_browser", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_OBJECT | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ANY), F1("crypt", MAY_BE_NULL | MAY_BE_STRING), F1("opendir", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE), - F1("closedir", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("chdir", MAY_BE_FALSE | MAY_BE_TRUE), + F0("closedir", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("chdir", MAY_BE_FALSE | MAY_BE_TRUE), #if defined(HAVE_CHROOT) && !defined(ZTS) && ENABLE_CHROOT_FUNC - F1("chroot", MAY_BE_FALSE | MAY_BE_TRUE), + F0("chroot", MAY_BE_FALSE | MAY_BE_TRUE), #endif F1("getcwd", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("rewinddir", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("rewinddir", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("readdir", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("dir", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_OBJECT), F1("scandir", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), #ifdef HAVE_GLOB F1("glob", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), #endif - F1("fileatime", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("filectime", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("filegroup", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("fileinode", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("filemtime", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("fileowner", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("fileperms", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("filesize", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("fileatime", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("filectime", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("filegroup", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("fileinode", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("filemtime", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("fileowner", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("fileperms", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("filesize", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), F1("filetype", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("file_exists", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("is_writable", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("is_writeable", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("is_readable", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("is_executable", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("is_file", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("is_dir", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("is_link", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("file_exists", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("is_writable", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("is_writeable", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("is_readable", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("is_executable", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("is_file", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("is_dir", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("is_link", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("stat", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_FALSE | MAY_BE_ARRAY_OF_TRUE | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING), F1("lstat", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_FALSE | MAY_BE_ARRAY_OF_TRUE | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING), #ifndef NETWARE - F1("chown", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("chgrp", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("chown", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("chgrp", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), #endif #if HAVE_LCHOWN - F1("lchown", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("lchown", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), #endif #if HAVE_LCHOWN - F1("lchgrp", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("lchgrp", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), #endif - F1("chmod", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("chmod", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), #if HAVE_UTIME - F1("touch", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("touch", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), #endif - F1("clearstatcache", MAY_BE_NULL), - F1("disk_total_space", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_DOUBLE), - F1("disk_free_space", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_DOUBLE), - F1("diskfreespace", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_DOUBLE), - F1("realpath_cache_size", MAY_BE_NULL | MAY_BE_LONG), + F0("clearstatcache", MAY_BE_NULL), + F0("disk_total_space", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_DOUBLE), + F0("disk_free_space", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_DOUBLE), + F0("diskfreespace", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_DOUBLE), + F0("realpath_cache_size", MAY_BE_NULL | MAY_BE_LONG), F1("realpath_cache_get", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ARRAY), - F1("mail", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("ezmlm_hash", MAY_BE_NULL | MAY_BE_LONG), + F0("mail", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("ezmlm_hash", MAY_BE_NULL | MAY_BE_LONG), #ifdef HAVE_SYSLOG_H - F1("openlog", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("syslog", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("closelog", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("openlog", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("syslog", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("closelog", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), #endif - F1("lcg_value", MAY_BE_DOUBLE), + F0("lcg_value", MAY_BE_DOUBLE), F1("metaphone", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("ob_start", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("ob_flush", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("ob_clean", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("ob_end_flush", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("ob_end_clean", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("ob_start", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("ob_flush", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("ob_clean", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("ob_end_flush", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("ob_end_clean", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("ob_get_flush", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("ob_get_clean", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("ob_get_length", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("ob_get_level", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("ob_get_length", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("ob_get_level", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), F1("ob_get_status", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY), - F1("ob_get_contents", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("ob_implicit_flush", MAY_BE_NULL), + FN("ob_get_contents", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), + F0("ob_implicit_flush", MAY_BE_NULL), F1("ob_list_handlers", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), - F1("ksort", MAY_BE_FALSE | MAY_BE_TRUE), - F1("krsort", MAY_BE_FALSE | MAY_BE_TRUE), - F1("natsort", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("natcasesort", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("asort", MAY_BE_FALSE | MAY_BE_TRUE), - F1("arsort", MAY_BE_FALSE | MAY_BE_TRUE), - F1("sort", MAY_BE_FALSE | MAY_BE_TRUE), - F1("rsort", MAY_BE_FALSE | MAY_BE_TRUE), - F1("usort", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("uasort", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("uksort", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("shuffle", MAY_BE_FALSE | MAY_BE_TRUE), - F1("array_walk", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("array_walk_recursive", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("count", MAY_BE_NULL | MAY_BE_LONG), - F1("end", UNKNOWN_INFO), - F1("prev", UNKNOWN_INFO), - F1("next", UNKNOWN_INFO), - F1("reset", UNKNOWN_INFO), - F1("current", UNKNOWN_INFO), - F1("key", MAY_BE_NULL | MAY_BE_LONG | MAY_BE_STRING), - F1("min", UNKNOWN_INFO), - F1("max", UNKNOWN_INFO), - F1("in_array", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("array_search", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_STRING), - F1("extract", MAY_BE_NULL | MAY_BE_LONG), + F0("ksort", MAY_BE_FALSE | MAY_BE_TRUE), + F0("krsort", MAY_BE_FALSE | MAY_BE_TRUE), + F0("natsort", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("natcasesort", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("asort", MAY_BE_FALSE | MAY_BE_TRUE), + F0("arsort", MAY_BE_FALSE | MAY_BE_TRUE), + F0("sort", MAY_BE_FALSE | MAY_BE_TRUE), + F0("rsort", MAY_BE_FALSE | MAY_BE_TRUE), + F0("usort", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("uasort", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("uksort", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("shuffle", MAY_BE_FALSE | MAY_BE_TRUE), + F0("array_walk", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("array_walk_recursive", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("count", MAY_BE_NULL | MAY_BE_LONG), + FN("end", UNKNOWN_INFO), + FN("prev", UNKNOWN_INFO), + FN("next", UNKNOWN_INFO), + FN("reset", UNKNOWN_INFO), + FN("current", UNKNOWN_INFO), + FN("key", MAY_BE_NULL | MAY_BE_LONG | MAY_BE_STRING), + FN("min", UNKNOWN_INFO), + FN("max", UNKNOWN_INFO), + F0("in_array", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + FN("array_search", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_STRING), + F0("extract", MAY_BE_NULL | MAY_BE_LONG), F1("compact", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY), F1("array_fill", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_ANY), F1("array_fill_keys", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY), FC("range", zend_range_info), - F1("array_multisort", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("array_push", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("array_pop", UNKNOWN_INFO), - F1("array_shift", UNKNOWN_INFO), - F1("array_unshift", MAY_BE_NULL | MAY_BE_LONG), + F0("array_multisort", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("array_push", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + FN("array_pop", UNKNOWN_INFO), + FN("array_shift", UNKNOWN_INFO), + F0("array_unshift", MAY_BE_NULL | MAY_BE_LONG), F1("array_splice", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY), F1("array_slice", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY), F1("array_merge", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY), @@ -841,46 +845,46 @@ static const func_info_t func_infos[] = { F1("array_udiff_assoc", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY), F1("array_diff_uassoc", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY), F1("array_udiff_uassoc", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY), - F1("array_sum", MAY_BE_NULL | MAY_BE_LONG | MAY_BE_DOUBLE), - F1("array_product", MAY_BE_NULL | MAY_BE_LONG | MAY_BE_DOUBLE), + F0("array_sum", MAY_BE_NULL | MAY_BE_LONG | MAY_BE_DOUBLE), + F0("array_product", MAY_BE_NULL | MAY_BE_LONG | MAY_BE_DOUBLE), F1("array_filter", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY), F1("array_map", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY), F1("array_chunk", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY), F1("array_combine", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY), - F1("array_key_exists", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("array_key_exists", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("pos", UNKNOWN_INFO), - F1("sizeof", MAY_BE_NULL | MAY_BE_LONG), - F1("key_exists", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("assert", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("sizeof", MAY_BE_NULL | MAY_BE_LONG), + F0("key_exists", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("assert", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("assert_options", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_OBJECT | MAY_BE_OBJECT), - F1("version_compare", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_LONG), + F0("version_compare", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_LONG), #if HAVE_FTOK - F1("ftok", MAY_BE_NULL | MAY_BE_LONG), + F0("ftok", MAY_BE_NULL | MAY_BE_LONG), #endif F1("str_rot13", MAY_BE_NULL | MAY_BE_STRING), F1("stream_get_filters", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), - F1("stream_filter_register", MAY_BE_FALSE | MAY_BE_TRUE), + F0("stream_filter_register", MAY_BE_FALSE | MAY_BE_TRUE), F1("stream_bucket_make_writeable", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_OBJECT), F1("stream_bucket_prepend", MAY_BE_FALSE | MAY_BE_OBJECT), F1("stream_bucket_append", MAY_BE_FALSE | MAY_BE_OBJECT), F1("stream_bucket_new", MAY_BE_FALSE | MAY_BE_OBJECT), - F1("output_add_rewrite_var", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("output_reset_rewrite_vars", MAY_BE_FALSE), + F0("output_add_rewrite_var", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("output_reset_rewrite_vars", MAY_BE_FALSE), F1("sys_get_temp_dir", MAY_BE_NULL | MAY_BE_STRING), /* ext/date */ - F1("strtotime", MAY_BE_FALSE | MAY_BE_LONG), + F0("strtotime", MAY_BE_FALSE | MAY_BE_LONG), F1("date", MAY_BE_FALSE | MAY_BE_STRING), - F1("idate", MAY_BE_FALSE | MAY_BE_LONG), + F0("idate", MAY_BE_FALSE | MAY_BE_LONG), F1("gmdate", MAY_BE_FALSE | MAY_BE_STRING), - F1("mktime", MAY_BE_FALSE | MAY_BE_LONG), - F1("gmmktime", MAY_BE_FALSE | MAY_BE_LONG), - F1("checkdate", MAY_BE_FALSE | MAY_BE_TRUE), + F0("mktime", MAY_BE_FALSE | MAY_BE_LONG), + F0("gmmktime", MAY_BE_FALSE | MAY_BE_LONG), + F0("checkdate", MAY_BE_FALSE | MAY_BE_TRUE), #ifdef HAVE_STRFTIME F1("strftime", MAY_BE_FALSE | MAY_BE_STRING), F1("gmstrftime", MAY_BE_FALSE | MAY_BE_STRING), #endif - F1("time", MAY_BE_LONG), + F0("time", MAY_BE_LONG), F1("localtime", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_LONG), F1("getdate", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING), F1("date_create", MAY_BE_FALSE | MAY_BE_OBJECT), @@ -891,22 +895,22 @@ static const func_info_t func_infos[] = { F1("date_parse_from_format", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ANY), F1("date_get_last_errors", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_ARRAY), F1("date_format", MAY_BE_FALSE | MAY_BE_STRING), - F1("date_modify", MAY_BE_FALSE | MAY_BE_OBJECT), - F1("date_add", MAY_BE_FALSE | MAY_BE_OBJECT), - F1("date_sub", MAY_BE_FALSE | MAY_BE_OBJECT), + FN("date_modify", MAY_BE_FALSE | MAY_BE_OBJECT), + FN("date_add", MAY_BE_FALSE | MAY_BE_OBJECT), + FN("date_sub", MAY_BE_FALSE | MAY_BE_OBJECT), F1("date_timezone_get", MAY_BE_FALSE | MAY_BE_OBJECT), - F1("date_timezone_set", MAY_BE_FALSE | MAY_BE_OBJECT), - F1("date_offset_get", MAY_BE_FALSE | MAY_BE_LONG), + FN("date_timezone_set", MAY_BE_FALSE | MAY_BE_OBJECT), + F0("date_offset_get", MAY_BE_FALSE | MAY_BE_LONG), F1("date_diff", MAY_BE_FALSE | MAY_BE_OBJECT), - F1("date_time_set", MAY_BE_FALSE | MAY_BE_OBJECT), - F1("date_date_set", MAY_BE_FALSE | MAY_BE_OBJECT), - F1("date_isodate_set", MAY_BE_FALSE | MAY_BE_OBJECT), - F1("date_timestamp_set", MAY_BE_FALSE | MAY_BE_OBJECT), - F1("date_timestamp_get", MAY_BE_FALSE | MAY_BE_LONG), + FN("date_time_set", MAY_BE_FALSE | MAY_BE_OBJECT), + FN("date_date_set", MAY_BE_FALSE | MAY_BE_OBJECT), + FN("date_isodate_set", MAY_BE_FALSE | MAY_BE_OBJECT), + FN("date_timestamp_set", MAY_BE_FALSE | MAY_BE_OBJECT), + F0("date_timestamp_get", MAY_BE_FALSE | MAY_BE_LONG), F1("timezone_open", MAY_BE_FALSE | MAY_BE_OBJECT), F1("timezone_name_get", MAY_BE_FALSE | MAY_BE_STRING), F1("timezone_name_from_abbr", MAY_BE_FALSE | MAY_BE_STRING), - F1("timezone_offset_get", MAY_BE_FALSE | MAY_BE_LONG), + F0("timezone_offset_get", MAY_BE_FALSE | MAY_BE_LONG), F1("timezone_transitions_get", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY), F1("timezone_location_get", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_DOUBLE | MAY_BE_ARRAY_OF_STRING), F1("timezone_identifiers_list", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), @@ -914,27 +918,27 @@ static const func_info_t func_infos[] = { F1("timezone_version_get", MAY_BE_STRING), F1("date_interval_create_from_date_string", MAY_BE_FALSE | MAY_BE_OBJECT), F1("date_interval_format", MAY_BE_FALSE | MAY_BE_STRING), - F1("date_default_timezone_set", MAY_BE_FALSE | MAY_BE_TRUE), + F0("date_default_timezone_set", MAY_BE_FALSE | MAY_BE_TRUE), F1("date_default_timezone_get", MAY_BE_STRING), F1("date_sunrise", MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_DOUBLE | MAY_BE_STRING), F1("date_sunset", MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_DOUBLE | MAY_BE_STRING), F1("date_sun_info", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_FALSE | MAY_BE_ARRAY_OF_TRUE | MAY_BE_ARRAY_OF_LONG), /* ext/preg */ - F1("preg_match", MAY_BE_FALSE | MAY_BE_LONG), - F1("preg_match_all", MAY_BE_FALSE | MAY_BE_LONG), + F0("preg_match", MAY_BE_FALSE | MAY_BE_LONG), + F0("preg_match_all", MAY_BE_FALSE | MAY_BE_LONG), F1("preg_replace", MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING), F1("preg_replace_callback", MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING), F1("preg_filter", MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING), F1("preg_split", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), F1("preg_quote", MAY_BE_NULL | MAY_BE_STRING), F1("preg_grep", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY), - F1("preg_last_error", MAY_BE_NULL | MAY_BE_LONG), + F0("preg_last_error", MAY_BE_NULL | MAY_BE_LONG), /* ext/ereg */ - F1("ereg", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("ereg", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), F1("ereg_replace", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("eregi", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("eregi", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), F1("eregi_replace", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("split", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), F1("spliti", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), @@ -943,10 +947,10 @@ static const func_info_t func_infos[] = { /* ext/mysql */ F1("mysql_connect", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE), F1("mysql_pconnect", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE), - F1("mysql_close", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("mysql_select_db", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("mysql_create_db", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("mysql_drop_db", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("mysql_close", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("mysql_select_db", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("mysql_create_db", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("mysql_drop_db", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("mysql_query", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_RESOURCE), F1("mysql_unbuffered_query", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_RESOURCE), F1("mysql_db_query", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_RESOURCE), @@ -955,50 +959,50 @@ static const func_info_t func_infos[] = { F1("mysql_list_fields", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE), F1("mysql_list_processes", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE), F1("mysql_error", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("mysql_errno", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("mysql_affected_rows", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("mysql_insert_id", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("mysql_errno", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("mysql_affected_rows", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("mysql_insert_id", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), F1("mysql_result", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("mysql_num_rows", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("mysql_num_fields", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("mysql_num_rows", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("mysql_num_fields", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), F1("mysql_fetch_row", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_ANY), F1("mysql_fetch_array", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY), F1("mysql_fetch_assoc", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ANY), F1("mysql_fetch_object", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_OBJECT), - F1("mysql_data_seek", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("mysql_data_seek", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("mysql_fetch_lengths", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_LONG), F1("mysql_fetch_field", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_OBJECT), - F1("mysql_field_seek", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("mysql_free_result", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("mysql_field_seek", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("mysql_free_result", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("mysql_field_name", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("mysql_field_table", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("mysql_field_len", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("mysql_field_len", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), F1("mysql_field_type", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("mysql_field_flags", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("mysql_escape_string", MAY_BE_NULL | MAY_BE_STRING), F1("mysql_real_escape_string", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("mysql_stat", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("mysql_thread_id", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("mysql_thread_id", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), F1("mysql_client_encoding", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("mysql_ping", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("mysql_ping", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("mysql_get_client_info", MAY_BE_NULL | MAY_BE_STRING), F1("mysql_get_host_info", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("mysql_get_proto_info", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("mysql_get_proto_info", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), F1("mysql_get_server_info", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("mysql_info", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("mysql_set_charset", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("mysql_set_charset", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("mysql", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE), F1("mysql_fieldname", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("mysql_fieldtable", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("mysql_fieldlen", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("mysql_fieldlen", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), F1("mysql_fieldtype", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("mysql_fieldflags", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("mysql_selectdb", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("mysql_createdb", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("mysql_dropdb", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("mysql_freeresult", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("mysql_numfields", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("mysql_numrows", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("mysql_selectdb", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("mysql_createdb", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("mysql_dropdb", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("mysql_freeresult", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("mysql_numfields", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("mysql_numrows", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), F1("mysql_listdbs", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE), F1("mysql_listtables", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE), F1("mysql_listfields", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE), @@ -1011,31 +1015,31 @@ static const func_info_t func_infos[] = { F1("curl_init", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE), F1("curl_copy_handle", MAY_BE_NULL | MAY_BE_RESOURCE), F1("curl_version", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY), - F1("curl_setopt", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("curl_setopt_array", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("curl_exec", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), + F0("curl_setopt", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("curl_setopt_array", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + FN("curl_exec", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("curl_getinfo", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_LONG | MAY_BE_DOUBLE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY), F1("curl_error", MAY_BE_NULL | MAY_BE_STRING), - F1("curl_errno", MAY_BE_NULL | MAY_BE_LONG), - F1("curl_close", MAY_BE_NULL), + F0("curl_errno", MAY_BE_NULL | MAY_BE_LONG), + F0("curl_close", MAY_BE_NULL), F1("curl_strerror", MAY_BE_NULL | MAY_BE_STRING), F1("curl_multi_strerror", MAY_BE_NULL | MAY_BE_STRING), - F1("curl_reset", MAY_BE_NULL), + F0("curl_reset", MAY_BE_NULL), F1("curl_escape", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("curl_unescape", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("curl_pause", MAY_BE_NULL | MAY_BE_LONG), + F0("curl_pause", MAY_BE_NULL | MAY_BE_LONG), F1("curl_multi_init", MAY_BE_NULL | MAY_BE_RESOURCE), - F1("curl_multi_add_handle", MAY_BE_NULL | MAY_BE_LONG), - F1("curl_multi_remove_handle", MAY_BE_NULL | MAY_BE_LONG), - F1("curl_multi_select", MAY_BE_NULL | MAY_BE_LONG), - F1("curl_multi_exec", MAY_BE_NULL | MAY_BE_LONG), + F0("curl_multi_add_handle", MAY_BE_NULL | MAY_BE_LONG), + F0("curl_multi_remove_handle", MAY_BE_NULL | MAY_BE_LONG), + F0("curl_multi_select", MAY_BE_NULL | MAY_BE_LONG), + F0("curl_multi_exec", MAY_BE_NULL | MAY_BE_LONG), F1("curl_multi_getcontent", MAY_BE_NULL | MAY_BE_STRING), F1("curl_multi_info_read", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_RESOURCE), - F1("curl_multi_close", MAY_BE_NULL), - F1("curl_multi_setopt", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("curl_multi_close", MAY_BE_NULL), + F0("curl_multi_setopt", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("curl_share_init", MAY_BE_NULL | MAY_BE_RESOURCE), - F1("curl_share_close", MAY_BE_NULL), - F1("curl_share_setopt", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("curl_share_close", MAY_BE_NULL), + F0("curl_share_setopt", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("curl_file_create", MAY_BE_OBJECT), /* ext/mbstring */ @@ -1048,22 +1052,22 @@ static const func_info_t func_infos[] = { F1("mb_http_output", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("mb_detect_order", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), F1("mb_substitute_character", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_STRING), - F1("mb_parse_str", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("mb_parse_str", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("mb_output_handler", MAY_BE_NULL | MAY_BE_STRING), F1("mb_preferred_mime_name", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("mb_strlen", MAY_BE_FALSE | MAY_BE_LONG), - F1("mb_strpos", MAY_BE_FALSE | MAY_BE_LONG), - F1("mb_strrpos", MAY_BE_FALSE | MAY_BE_LONG), - F1("mb_stripos", MAY_BE_FALSE | MAY_BE_LONG), - F1("mb_strripos", MAY_BE_FALSE | MAY_BE_LONG), + F0("mb_strlen", MAY_BE_FALSE | MAY_BE_LONG), + F0("mb_strpos", MAY_BE_FALSE | MAY_BE_LONG), + F0("mb_strrpos", MAY_BE_FALSE | MAY_BE_LONG), + F0("mb_stripos", MAY_BE_FALSE | MAY_BE_LONG), + F0("mb_strripos", MAY_BE_FALSE | MAY_BE_LONG), F1("mb_strstr", MAY_BE_FALSE | MAY_BE_STRING), F1("mb_strrchr", MAY_BE_FALSE | MAY_BE_STRING), F1("mb_stristr", MAY_BE_FALSE | MAY_BE_STRING), F1("mb_strrichr", MAY_BE_FALSE | MAY_BE_STRING), - F1("mb_substr_count", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("mb_substr_count", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), F1("mb_substr", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("mb_strcut", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("mb_strwidth", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("mb_strwidth", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), F1("mb_strimwidth", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("mb_convert_encoding", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("mb_detect_encoding", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), @@ -1075,50 +1079,50 @@ static const func_info_t func_infos[] = { F1("mb_convert_variables", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("mb_encode_numericentity", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("mb_decode_numericentity", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("mb_send_mail", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("mb_send_mail", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("mb_get_info", MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY), - F1("mb_check_encoding", MAY_BE_FALSE | MAY_BE_TRUE), + F0("mb_check_encoding", MAY_BE_FALSE | MAY_BE_TRUE), F1("mb_regex_encoding", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("mb_regex_set_options", MAY_BE_FALSE | MAY_BE_STRING), - F1("mb_ereg", MAY_BE_FALSE | MAY_BE_LONG), - F1("mb_eregi", MAY_BE_FALSE | MAY_BE_LONG), + F0("mb_ereg", MAY_BE_FALSE | MAY_BE_LONG), + F0("mb_eregi", MAY_BE_FALSE | MAY_BE_LONG), F1("mb_ereg_replace", MAY_BE_FALSE | MAY_BE_STRING), F1("mb_eregi_replace", MAY_BE_FALSE | MAY_BE_STRING), F1("mb_ereg_replace_callback", MAY_BE_FALSE | MAY_BE_STRING), F1("mb_split", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), - F1("mb_ereg_match", MAY_BE_FALSE | MAY_BE_TRUE), - F1("mb_ereg_search", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("mb_ereg_match", MAY_BE_FALSE | MAY_BE_TRUE), + F0("mb_ereg_search", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("mb_ereg_search_pos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_LONG), F1("mb_ereg_search_regs", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_FALSE | MAY_BE_ARRAY_OF_TRUE | MAY_BE_ARRAY_OF_STRING), - F1("mb_ereg_search_init", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("mb_ereg_search_init", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("mb_ereg_search_getregs", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_FALSE | MAY_BE_ARRAY_OF_TRUE | MAY_BE_ARRAY_OF_STRING), - F1("mb_ereg_search_getpos", MAY_BE_LONG), - F1("mb_ereg_search_setpos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("mb_ereg_search_getpos", MAY_BE_LONG), + F0("mb_ereg_search_setpos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("mbregex_encoding", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("mbereg", MAY_BE_FALSE | MAY_BE_LONG), - F1("mberegi", MAY_BE_FALSE | MAY_BE_LONG), + F0("mbregex_encoding", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("mbereg", MAY_BE_FALSE | MAY_BE_LONG), + F0("mberegi", MAY_BE_FALSE | MAY_BE_LONG), F1("mbereg_replace", MAY_BE_FALSE | MAY_BE_STRING), F1("mberegi_replace", MAY_BE_FALSE | MAY_BE_STRING), F1("mbsplit", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), - F1("mbereg_match", MAY_BE_FALSE | MAY_BE_TRUE), - F1("mbereg_search", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("mbereg_match", MAY_BE_FALSE | MAY_BE_TRUE), + F0("mbereg_search", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("mbereg_search_pos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_LONG), F1("mbereg_search_regs", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_FALSE | MAY_BE_ARRAY_OF_TRUE | MAY_BE_ARRAY_OF_STRING), - F1("mbereg_search_init", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("mbereg_search_init", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("mbereg_search_getregs", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_FALSE | MAY_BE_ARRAY_OF_TRUE | MAY_BE_ARRAY_OF_STRING), - F1("mbereg_search_getpos", MAY_BE_LONG), - F1("mbereg_search_setpos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("mbereg_search_getpos", MAY_BE_LONG), + F0("mbereg_search_setpos", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), /* ext/iconv */ F1("iconv", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("iconv_get_encoding", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING), - F1("iconv_set_encoding", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("iconv_strlen", MAY_BE_FALSE | MAY_BE_LONG), + F0("iconv_set_encoding", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("iconv_strlen", MAY_BE_FALSE | MAY_BE_LONG), F1("iconv_substr", MAY_BE_FALSE | MAY_BE_STRING), - F1("iconv_strpos", MAY_BE_FALSE | MAY_BE_LONG), - F1("iconv_strrpos", MAY_BE_FALSE | MAY_BE_LONG), + F0("iconv_strpos", MAY_BE_FALSE | MAY_BE_LONG), + F0("iconv_strrpos", MAY_BE_FALSE | MAY_BE_LONG), F1("iconv_mime_encode", MAY_BE_FALSE | MAY_BE_STRING), F1("iconv_mime_decode", MAY_BE_FALSE | MAY_BE_STRING), F1("iconv_mime_decode_headers", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY), @@ -1126,50 +1130,50 @@ static const func_info_t func_infos[] = { /* ext/json */ F1("json_encode", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("json_decode", MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY), - F1("json_last_error", MAY_BE_NULL | MAY_BE_LONG), + F0("json_last_error", MAY_BE_NULL | MAY_BE_LONG), F1("json_last_error_msg", MAY_BE_NULL | MAY_BE_STRING), /* ext/xml */ F1("xml_parser_create", MAY_BE_FALSE | MAY_BE_RESOURCE), F1("xml_parser_create_ns", MAY_BE_FALSE | MAY_BE_RESOURCE), - F1("xml_set_object", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("xml_set_element_handler", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("xml_set_character_data_handler", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("xml_set_processing_instruction_handler",MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("xml_set_default_handler", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("xml_set_unparsed_entity_decl_handler", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("xml_set_notation_decl_handler", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("xml_set_external_entity_ref_handler", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("xml_set_start_namespace_decl_handler", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("xml_set_end_namespace_decl_handler", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("xml_parse", MAY_BE_NULL | MAY_BE_LONG), - F1("xml_parse_into_struct", MAY_BE_NULL | MAY_BE_LONG), - F1("xml_get_error_code", MAY_BE_NULL | MAY_BE_LONG), + F0("xml_set_object", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("xml_set_element_handler", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("xml_set_character_data_handler", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("xml_set_processing_instruction_handler",MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("xml_set_default_handler", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("xml_set_unparsed_entity_decl_handler", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("xml_set_notation_decl_handler", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("xml_set_external_entity_ref_handler", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("xml_set_start_namespace_decl_handler", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("xml_set_end_namespace_decl_handler", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("xml_parse", MAY_BE_NULL | MAY_BE_LONG), + F0("xml_parse_into_struct", MAY_BE_NULL | MAY_BE_LONG), + F0("xml_get_error_code", MAY_BE_NULL | MAY_BE_LONG), F1("xml_error_string", MAY_BE_NULL | MAY_BE_STRING), - F1("xml_get_current_line_number", MAY_BE_NULL | MAY_BE_LONG), - F1("xml_get_current_column_number", MAY_BE_NULL | MAY_BE_LONG), - F1("xml_get_current_byte_index", MAY_BE_NULL | MAY_BE_LONG), - F1("xml_parser_free", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("xml_parser_set_option", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("xml_get_current_line_number", MAY_BE_NULL | MAY_BE_LONG), + F0("xml_get_current_column_number", MAY_BE_NULL | MAY_BE_LONG), + F0("xml_get_current_byte_index", MAY_BE_NULL | MAY_BE_LONG), + F0("xml_parser_free", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("xml_parser_set_option", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("xml_parser_get_option", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_STRING), F1("utf8_encode", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("utf8_decode", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), /* ext/zlib */ - F1("readgzfile", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), - F1("gzrewind", MAY_BE_FALSE | MAY_BE_TRUE), - F1("gzclose", MAY_BE_FALSE | MAY_BE_TRUE), - F1("gzeof", MAY_BE_FALSE | MAY_BE_TRUE), + F0("readgzfile", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("gzrewind", MAY_BE_FALSE | MAY_BE_TRUE), + F0("gzclose", MAY_BE_FALSE | MAY_BE_TRUE), + F0("gzeof", MAY_BE_FALSE | MAY_BE_TRUE), F1("gzgetc", MAY_BE_FALSE | MAY_BE_STRING), F1("gzgets", MAY_BE_FALSE | MAY_BE_STRING), F1("gzgetss", MAY_BE_FALSE | MAY_BE_STRING), F1("gzread", MAY_BE_FALSE | MAY_BE_STRING), F1("gzopen", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE), - F1("gzpassthru", MAY_BE_FALSE | MAY_BE_LONG), - F1("gzseek", MAY_BE_FALSE | MAY_BE_LONG), - F1("gztell", MAY_BE_FALSE | MAY_BE_LONG), - F1("gzwrite", MAY_BE_FALSE | MAY_BE_LONG), - F1("gzputs", MAY_BE_FALSE | MAY_BE_LONG), + F0("gzpassthru", MAY_BE_FALSE | MAY_BE_LONG), + F0("gzseek", MAY_BE_FALSE | MAY_BE_LONG), + F0("gztell", MAY_BE_FALSE | MAY_BE_LONG), + F0("gzwrite", MAY_BE_FALSE | MAY_BE_LONG), + F0("gzputs", MAY_BE_FALSE | MAY_BE_LONG), F1("gzfile", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), F1("gzcompress", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("gzuncompress", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), @@ -1188,17 +1192,17 @@ static const func_info_t func_infos[] = { F1("hash_hmac", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("hash_hmac_file", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("hash_init", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE), - F1("hash_update", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), - F1("hash_update_stream", MAY_BE_NULL | MAY_BE_LONG), - F1("hash_update_file", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("hash_update", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), + F0("hash_update_stream", MAY_BE_NULL | MAY_BE_LONG), + F0("hash_update_file", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("hash_final", MAY_BE_NULL | MAY_BE_STRING), F1("hash_copy", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_RESOURCE), F1("hash_algos", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), F1("hash_pbkdf2", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("mhash_keygen_s2k", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("mhash_get_block_size", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), + F0("mhash_get_block_size", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG), F1("mhash_get_hash_name", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), - F1("mhash_count", MAY_BE_NULL | MAY_BE_LONG), + F0("mhash_count", MAY_BE_NULL | MAY_BE_LONG), F1("mhash", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), }; diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c index f9fd267..366896e 100644 --- a/ext/opcache/Optimizer/zend_inference.c +++ b/ext/opcache/Optimizer/zend_inference.c @@ -873,7 +873,17 @@ int zend_inference_calc_range(const zend_op_array *op_array, zend_ssa *ssa, int } break; case ZEND_CAST: - if (ssa->ops[line].result_def == var) { + if (ssa->ops[line].op1_def == var) { + if (ssa->ops[line].op1_def >= 0) { + if (OP1_HAS_RANGE()) { + tmp->underflow = OP1_RANGE_UNDERFLOW(); + tmp->min = OP1_MIN_RANGE(); + tmp->max = OP1_MAX_RANGE(); + tmp->overflow = OP1_RANGE_OVERFLOW(); + return 1; + } + } + } else if (ssa->ops[line].result_def == var) { if (opline->extended_value == IS_NULL) { tmp->min = 0; tmp->max = 0; @@ -2019,6 +2029,10 @@ static int zend_infer_ranges(const zend_op_array *op_array, zend_ssa *ssa) /* {{ if (__type & (MAY_BE_REF|MAY_BE_RCN)) { \ __type |= MAY_BE_RC1 | MAY_BE_RCN; \ } \ + if ((__type & MAY_BE_RC1) && (__type & MAY_BE_STRING)) {\ + /* TODO: support for array keys and ($str . "")*/ \ + __type |= MAY_BE_RCN; \ + } \ } \ if (ssa_var_info[__var].type != __type) { \ check_type_narrowing(op_array, ssa, worklist, \ @@ -2181,7 +2195,7 @@ uint32_t zend_array_element_type(uint32_t t1, int write, int insert) } if (t1 & MAY_BE_ARRAY) { if (insert) { - tmp |= MAY_BE_NULL | MAY_BE_RCN; + tmp |= MAY_BE_NULL; } else { tmp |= MAY_BE_NULL | ((t1 & MAY_BE_ARRAY_OF_ANY) >> MAY_BE_ARRAY_SHIFT); if (tmp & MAY_BE_ARRAY) { @@ -2189,7 +2203,7 @@ uint32_t zend_array_element_type(uint32_t t1, int write, int insert) } if (t1 & MAY_BE_ARRAY_OF_REF) { tmp |= MAY_BE_REF | MAY_BE_RC1 | MAY_BE_RCN; - } else { + } else if (tmp & (MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE)) { tmp |= MAY_BE_RC1 | MAY_BE_RCN; } } @@ -2201,7 +2215,7 @@ uint32_t zend_array_element_type(uint32_t t1, int write, int insert) } } if (t1 & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE)) { - tmp |= MAY_BE_NULL | MAY_BE_RCN; + tmp |= MAY_BE_NULL; if (t1 & MAY_BE_ERROR) { if (write) { tmp |= MAY_BE_ERROR; @@ -2209,7 +2223,7 @@ uint32_t zend_array_element_type(uint32_t t1, int write, int insert) } } if (t1 & (MAY_BE_TRUE|MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_RESOURCE)) { - tmp |= MAY_BE_NULL | MAY_BE_RCN; + tmp |= MAY_BE_NULL; if (write) { tmp |= MAY_BE_ERROR; } @@ -2219,15 +2233,18 @@ uint32_t zend_array_element_type(uint32_t t1, int write, int insert) static uint32_t assign_dim_result_type( uint32_t arr_type, uint32_t dim_type, uint32_t value_type, zend_uchar dim_op_type) { - uint32_t tmp = arr_type - & (MAY_BE_ANY|MAY_BE_REF|MAY_BE_ARRAY_KEY_ANY|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF) - & ~(MAY_BE_NULL|MAY_BE_FALSE); - if (arr_type & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_STRING)) { - tmp |= MAY_BE_ARRAY; + uint32_t tmp = arr_type & ~(MAY_BE_RC1|MAY_BE_RCN); + + if (arr_type & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE)) { + tmp &= ~(MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE); + tmp |= MAY_BE_ARRAY|MAY_BE_RC1; } - if (arr_type & (MAY_BE_RC1|MAY_BE_RCN)) { + if (tmp & (MAY_BE_ARRAY|MAY_BE_STRING)) { tmp |= MAY_BE_RC1; } + if (tmp & (MAY_BE_OBJECT|MAY_BE_RESOURCE)) { + tmp |= MAY_BE_RC1 | MAY_BE_RCN; + } if (tmp & MAY_BE_ARRAY) { tmp |= (value_type & MAY_BE_ANY) << MAY_BE_ARRAY_SHIFT; if (value_type & MAY_BE_UNDEF) { @@ -2257,12 +2274,11 @@ static uint32_t assign_dim_result_type( /* For binary ops that have compound assignment operators */ static uint32_t binary_op_result_type( zend_ssa *ssa, zend_uchar opcode, uint32_t t1, uint32_t t2, uint32_t result_var) { - uint32_t tmp; + uint32_t tmp = 0; uint32_t t1_type = (t1 & MAY_BE_ANY) | (t1 & MAY_BE_UNDEF ? MAY_BE_NULL : 0); uint32_t t2_type = (t2 & MAY_BE_ANY) | (t2 & MAY_BE_UNDEF ? MAY_BE_NULL : 0); switch (opcode) { case ZEND_ADD: - tmp = MAY_BE_RC1; if (t1_type == MAY_BE_LONG && t2_type == MAY_BE_LONG) { if (!ssa->var_info[result_var].has_range || ssa->var_info[result_var].range.underflow || @@ -2275,13 +2291,13 @@ static uint32_t binary_op_result_type( } else if (t1_type == MAY_BE_DOUBLE || t2_type == MAY_BE_DOUBLE) { tmp |= MAY_BE_DOUBLE; } else if (t1_type == MAY_BE_ARRAY && t2_type == MAY_BE_ARRAY) { - tmp |= MAY_BE_ARRAY; + tmp |= MAY_BE_ARRAY | MAY_BE_RC1; tmp |= t1 & (MAY_BE_ARRAY_KEY_ANY|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF); tmp |= t2 & (MAY_BE_ARRAY_KEY_ANY|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF); } else { tmp |= MAY_BE_LONG | MAY_BE_DOUBLE; if ((t1_type & MAY_BE_ARRAY) && (t2_type & MAY_BE_ARRAY)) { - tmp |= MAY_BE_ARRAY; + tmp |= MAY_BE_ARRAY | MAY_BE_RC1; tmp |= t1 & (MAY_BE_ARRAY_KEY_ANY|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF); tmp |= t2 & (MAY_BE_ARRAY_KEY_ANY|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF); } @@ -2289,7 +2305,6 @@ static uint32_t binary_op_result_type( break; case ZEND_SUB: case ZEND_MUL: - tmp = MAY_BE_RC1; if (t1_type == MAY_BE_LONG && t2_type == MAY_BE_LONG) { if (!ssa->var_info[result_var].has_range || ssa->var_info[result_var].range.underflow || @@ -2307,7 +2322,6 @@ static uint32_t binary_op_result_type( break; case ZEND_DIV: case ZEND_POW: - tmp = MAY_BE_RC1; if (t1_type == MAY_BE_DOUBLE || t2_type == MAY_BE_DOUBLE) { tmp |= MAY_BE_DOUBLE; } else { @@ -2317,15 +2331,14 @@ static uint32_t binary_op_result_type( * handling */ break; case ZEND_MOD: - tmp = MAY_BE_RC1 | MAY_BE_LONG; + tmp = MAY_BE_LONG; /* Division by zero results in an exception, so it doesn't need any special handling */ break; case ZEND_BW_OR: case ZEND_BW_AND: case ZEND_BW_XOR: - tmp = MAY_BE_RC1; if ((t1_type & MAY_BE_STRING) && (t2_type & MAY_BE_STRING)) { - tmp |= MAY_BE_STRING; + tmp |= MAY_BE_STRING | MAY_BE_RC1; } if ((t1_type & ~MAY_BE_STRING) || (t2_type & ~MAY_BE_STRING)) { tmp |= MAY_BE_LONG; @@ -2333,11 +2346,12 @@ static uint32_t binary_op_result_type( break; case ZEND_SL: case ZEND_SR: - tmp = MAY_BE_RC1|MAY_BE_LONG; + tmp = MAY_BE_LONG; break; case ZEND_CONCAT: + case ZEND_FAST_CONCAT: /* TODO: +MAY_BE_OBJECT ??? */ - tmp = MAY_BE_RC1|MAY_BE_STRING; + tmp = MAY_BE_STRING | MAY_BE_RC1 | MAY_BE_RCN; break; EMPTY_SWITCH_DEFAULT_CASE() } @@ -2452,9 +2466,9 @@ static void zend_update_type_info(const zend_op_array *op_array, UPDATE_SSA_TYPE(tmp, ssa_ops[i].result_def); break; case ZEND_BW_NOT: - tmp = MAY_BE_RC1; + tmp = 0; if (t1 & MAY_BE_STRING) { - tmp |= MAY_BE_STRING; + tmp |= MAY_BE_STRING | MAY_BE_RC1; } if (t1 & (MAY_BE_ANY-MAY_BE_STRING)) { tmp |= MAY_BE_LONG; @@ -2462,7 +2476,7 @@ static void zend_update_type_info(const zend_op_array *op_array, UPDATE_SSA_TYPE(tmp, ssa_ops[i].result_def); break; case ZEND_BEGIN_SILENCE: - UPDATE_SSA_TYPE(MAY_BE_RC1|MAY_BE_LONG, ssa_ops[i].result_def); + UPDATE_SSA_TYPE(MAY_BE_LONG, ssa_ops[i].result_def); break; case ZEND_BOOL_NOT: case ZEND_BOOL_XOR: @@ -2482,14 +2496,36 @@ static void zend_update_type_info(const zend_op_array *op_array, case ZEND_ISSET_ISEMPTY_PROP_OBJ: case ZEND_ISSET_ISEMPTY_STATIC_PROP: case ZEND_ASSERT_CHECK: - UPDATE_SSA_TYPE(MAY_BE_RC1|MAY_BE_FALSE|MAY_BE_TRUE, ssa_ops[i].result_def); + UPDATE_SSA_TYPE(MAY_BE_FALSE|MAY_BE_TRUE, ssa_ops[i].result_def); break; case ZEND_CAST: - tmp = MAY_BE_RC1; + if (ssa_ops[i].op1_def >= 0) { + tmp = t1; + if ((t1 & (MAY_BE_ARRAY|MAY_BE_OBJECT)) && + (opline->op1_type == IS_CV) && + (opline->extended_value == IS_ARRAY || + opline->extended_value == IS_OBJECT)) { + tmp |= MAY_BE_RCN; + } + UPDATE_SSA_TYPE(tmp, ssa_ops[i].op1_def); + COPY_SSA_OBJ_TYPE(ssa_ops[i].op1_use, ssa_ops[i].op1_def); + } + tmp = 0; if (opline->extended_value == _IS_BOOL) { tmp |= MAY_BE_TRUE|MAY_BE_FALSE; } else { tmp |= 1 << opline->extended_value; + if (tmp & (MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE)) { + if ((tmp & MAY_BE_ANY) == (t1 & MAY_BE_ANY)) { + tmp |= (t1 & MAY_BE_RC1) | MAY_BE_RCN; + } else if ((opline->extended_value == IS_ARRAY || + opline->extended_value == IS_OBJECT) && + (tmp & (MAY_BE_ARRAY|MAY_BE_OBJECT))) { + tmp |= MAY_BE_RC1 | MAY_BE_RCN; + } else { + tmp |= MAY_BE_RC1; + } + } } if (opline->extended_value == IS_ARRAY) { if (t1 & MAY_BE_ARRAY) { @@ -2510,8 +2546,11 @@ static void zend_update_type_info(const zend_op_array *op_array, if (t1 & MAY_BE_UNDEF) { tmp |= MAY_BE_NULL; } - if (opline->op1_type & (IS_CV|IS_VAR)) { - tmp |= MAY_BE_RCN; + if (t1 & (MAY_BE_RC1|MAY_BE_RCN)) { + tmp |= (t1 & (MAY_BE_RC1|MAY_BE_RCN)); + if (opline->op1_type == IS_CV) { + tmp |= MAY_BE_RCN; + } } if (opline->opcode != ZEND_QM_ASSIGN) { /* COALESCE and JMP_SET result can't be null */ @@ -2539,21 +2578,18 @@ static void zend_update_type_info(const zend_op_array *op_array, orig = 0; if (opline->extended_value == ZEND_ASSIGN_OBJ) { tmp = MAY_BE_RC1; - orig = t1 & ~MAY_BE_UNDEF; + orig = t1; t1 = MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF; t2 = OP1_DATA_INFO(); } else if (opline->extended_value == ZEND_ASSIGN_DIM) { tmp = MAY_BE_RC1; - orig = t1 & ~MAY_BE_UNDEF; + orig = t1; t1 = zend_array_element_type(t1, 1, 0); t2 = OP1_DATA_INFO(); } else { tmp = 0; if (t1 & (MAY_BE_RC1|MAY_BE_RCN)) { - tmp |= MAY_BE_RC1; - if (ssa_ops[i].result_def >= 0) { - tmp |= MAY_BE_RCN; - } + tmp |= MAY_BE_RC1 | MAY_BE_RCN; } if (t1 & MAY_BE_REF) { tmp |= MAY_BE_REF; @@ -2571,11 +2607,12 @@ static void zend_update_type_info(const zend_op_array *op_array, } } else if (opline->extended_value == ZEND_ASSIGN_OBJ) { if (opline->op1_type == IS_CV) { - if (orig & (MAY_BE_UNDEF | MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING)) { - orig |= MAY_BE_OBJECT; + if (orig & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE)) { + orig &= (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE); + orig |= MAY_BE_OBJECT | MAY_BE_RC1 | MAY_BE_RCN; } - if (orig & MAY_BE_RCN) { - orig |= MAY_BE_RC1; + if (orig & MAY_BE_OBJECT) { + orig |= (MAY_BE_RC1|MAY_BE_RCN); } UPDATE_SSA_TYPE(orig, ssa_ops[i].op1_def); COPY_SSA_OBJ_TYPE(ssa_ops[i].op1_use, ssa_ops[i].op1_def); @@ -2666,7 +2703,11 @@ static void zend_update_type_info(const zend_op_array *op_array, case ZEND_POST_INC: case ZEND_POST_DEC: if (ssa_ops[i].result_def >= 0) { - tmp = (MAY_BE_RC1 | t1) & ~(MAY_BE_UNDEF|MAY_BE_ERROR|MAY_BE_REF|MAY_BE_RCN); + tmp = 0; + if (t1 & (MAY_BE_RC1|MAY_BE_RCN)) { + tmp |= MAY_BE_RC1|MAY_BE_RCN; + } + tmp |= t1 & ~(MAY_BE_UNDEF|MAY_BE_ERROR|MAY_BE_REF|MAY_BE_RCN); if (t1 & MAY_BE_UNDEF) { tmp |= MAY_BE_NULL; } @@ -2767,16 +2808,13 @@ static void zend_update_type_info(const zend_op_array *op_array, break; case ZEND_ASSIGN_OBJ: if (opline->op1_type == IS_CV) { - tmp = (t1 & (MAY_BE_ANY|MAY_BE_ARRAY_KEY_ANY|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF)); - tmp &= ~MAY_BE_NULL; - if (t1 & (MAY_BE_UNDEF | MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING)) { - tmp |= MAY_BE_OBJECT; - } - if (t1 & MAY_BE_REF) { - tmp |= MAY_BE_REF; + tmp = t1; + if (t1 & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE)) { + tmp &= ~(MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE); + tmp |= MAY_BE_OBJECT | MAY_BE_RC1 | MAY_BE_RCN; } - if (t1 & (MAY_BE_RC1|MAY_BE_RCN)) { - tmp |= MAY_BE_RC1; + if (tmp & MAY_BE_OBJECT) { + tmp |= MAY_BE_RC1 | MAY_BE_RCN; } UPDATE_SSA_TYPE(tmp, ssa_ops[i].op1_def); COPY_SSA_OBJ_TYPE(ssa_ops[i].op1_use, ssa_ops[i].op1_def); @@ -2815,22 +2853,15 @@ static void zend_update_type_info(const zend_op_array *op_array, if (t1 & MAY_BE_REF) { tmp |= MAY_BE_REF; } - if (t1 & (MAY_BE_RC1 | MAY_BE_RCN)) { - if (t2 & MAY_BE_REF) { - tmp |= MAY_BE_RC1; - } - if (t2 & MAY_BE_RC1) { - tmp |= MAY_BE_RC1; - if (opline->op2_type & (IS_CV|IS_VAR)) { - tmp |= MAY_BE_RCN; - } - } - if (t2 & MAY_BE_RCN) { - tmp |= MAY_BE_RCN; - } - if (RETURN_VALUE_USED(opline) && (tmp & MAY_BE_RC1)) { - tmp |= MAY_BE_RCN; - } + if (t2 & MAY_BE_REF) { + tmp |= MAY_BE_RC1 | MAY_BE_RCN; + } else if (opline->op2_type & (IS_TMP_VAR|IS_VAR)) { + tmp |= t2 & (MAY_BE_RC1|MAY_BE_RCN); + } else if (t2 & (MAY_BE_RC1|MAY_BE_RCN)) { + tmp |= MAY_BE_RCN; + } + if (RETURN_VALUE_USED(opline) && (tmp & MAY_BE_RC1)) { + tmp |= MAY_BE_RCN; } if (ssa_ops[i].op1_def >= 0) { if (ssa_var_info[ssa_ops[i].op1_def].use_as_double) { @@ -2878,14 +2909,24 @@ static void zend_update_type_info(const zend_op_array *op_array, UPDATE_SSA_TYPE(tmp, ssa_ops[i].op1_def); break; case ZEND_SEND_VAR: - UPDATE_SSA_TYPE(t1 | MAY_BE_RC1 | MAY_BE_RCN, ssa_ops[i].op1_def); - COPY_SSA_OBJ_TYPE(ssa_ops[i].op1_use, ssa_ops[i].op1_def); + if (ssa_ops[i].op1_def >= 0) { + tmp = t1; + if ((t1 & (MAY_BE_RC1|MAY_BE_REF)) && (opline->op1_type == IS_CV)) { + tmp |= MAY_BE_RCN; + } + UPDATE_SSA_TYPE(tmp, ssa_ops[i].op1_def); + COPY_SSA_OBJ_TYPE(ssa_ops[i].op1_use, ssa_ops[i].op1_def); + } break; case ZEND_BIND_LEXICAL: if (ssa_ops[i].op2_def >= 0) { - tmp = t2 | MAY_BE_RC1 | MAY_BE_RCN; if (opline->extended_value) { - tmp |= MAY_BE_REF; + tmp = t2 | MAY_BE_REF; + } else { + tmp = t2 & ~(MAY_BE_RC1|MAY_BE_RCN); + if (t2 & (MAY_BE_RC1|MAY_BE_RCN)) { + tmp |= MAY_BE_RCN; + } } UPDATE_SSA_TYPE(tmp, ssa_ops[i].op2_def); COPY_SSA_OBJ_TYPE(ssa_ops[i].op2_use, ssa_ops[i].op2_def); @@ -2893,9 +2934,13 @@ static void zend_update_type_info(const zend_op_array *op_array, break; case ZEND_YIELD: if (ssa_ops[i].op1_def >= 0) { - tmp = t1 | MAY_BE_RC1 | MAY_BE_RCN; if (op_array->fn_flags & ZEND_ACC_RETURN_REFERENCE) { - tmp |= MAY_BE_REF; + tmp = t1 & MAY_BE_REF; + } else { + tmp = t1 & ~(MAY_BE_RC1|MAY_BE_RCN); + if (t1 & (MAY_BE_RC1|MAY_BE_RCN)) { + tmp |= MAY_BE_RCN; + } } UPDATE_SSA_TYPE(tmp, ssa_ops[i].op1_def); COPY_SSA_OBJ_TYPE(ssa_ops[i].op1_use, ssa_ops[i].op1_def); @@ -2918,10 +2963,14 @@ static void zend_update_type_info(const zend_op_array *op_array, break; case ZEND_SEND_UNPACK: if (ssa_ops[i].op1_def >= 0) { - tmp = t1 | MAY_BE_RC1|MAY_BE_RCN; + tmp = t1; if (t1 & MAY_BE_ARRAY) { + tmp |= MAY_BE_RC1 | MAY_BE_RCN; /* SEND_UNPACK may acquire references into the array */ - tmp |= MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF; + tmp |= MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF; + } + if (t1 & MAY_BE_OBJECT) { + tmp |= MAY_BE_RC1 | MAY_BE_RCN; } UPDATE_SSA_TYPE(tmp, ssa_ops[i].op1_def); } @@ -2930,7 +2979,7 @@ static void zend_update_type_info(const zend_op_array *op_array, case ZEND_ROPE_INIT: case ZEND_ROPE_ADD: case ZEND_ROPE_END: - UPDATE_SSA_TYPE(MAY_BE_RC1|MAY_BE_STRING, ssa_ops[i].result_def); + UPDATE_SSA_TYPE(MAY_BE_STRING|MAY_BE_RC1|MAY_BE_RCN, ssa_ops[i].result_def); break; case ZEND_RECV: case ZEND_RECV_INIT: @@ -2952,7 +3001,7 @@ static void zend_update_type_info(const zend_op_array *op_array, } if (arg_info->pass_by_reference) { tmp |= MAY_BE_REF; - } else { + } else if (tmp & (MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE)) { tmp |= MAY_BE_RC1|MAY_BE_RCN; } } else { @@ -3108,7 +3157,7 @@ static void zend_update_type_info(const zend_op_array *op_array, break; case ZEND_UNSET_VAR: ZEND_ASSERT(opline->extended_value & ZEND_QUICK_SET); - tmp = MAY_BE_UNDEF|MAY_BE_RCN; + tmp = MAY_BE_UNDEF; if (!op_array->function_name) { /* In global scope, we know nothing */ tmp |= MAY_BE_REF; @@ -3126,12 +3175,12 @@ static void zend_update_type_info(const zend_op_array *op_array, case ZEND_FE_RESET_RW: if (ssa_ops[i].op1_def >= 0) { tmp = t1; - if (t1 & MAY_BE_RCN) { - tmp |= MAY_BE_RC1; - } if (opline->opcode == ZEND_FE_RESET_RW) { -//??? tmp |= MAY_BE_REF; + } else { + if ((t1 & MAY_BE_RC1) && opline->op1_type != IS_TMP_VAR) { + tmp |= MAY_BE_RCN; + } } UPDATE_SSA_TYPE(tmp, ssa_ops[i].op1_def); COPY_SSA_OBJ_TYPE(ssa_ops[i].op1_use, ssa_ops[i].op1_def); @@ -3139,57 +3188,49 @@ static void zend_update_type_info(const zend_op_array *op_array, if (opline->opcode == ZEND_FE_RESET_RW) { //??? tmp = MAY_BE_REF | (t1 & (MAY_BE_ARRAY | MAY_BE_OBJECT)); - } else if (opline->op1_type == IS_TMP_VAR || opline->op1_type == IS_CONST) { - tmp = MAY_BE_RC1 | (t1 & (MAY_BE_ARRAY | MAY_BE_OBJECT | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF)); } else { - tmp = MAY_BE_RC1 | MAY_BE_RCN | (t1 & (MAY_BE_REF | MAY_BE_ARRAY | MAY_BE_OBJECT | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF)); + tmp = MAY_BE_RC1 | MAY_BE_RCN | (t1 & (MAY_BE_ARRAY | MAY_BE_OBJECT | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF)); } UPDATE_SSA_TYPE(tmp, ssa_ops[i].result_def); COPY_SSA_OBJ_TYPE(ssa_ops[i].op1_use, ssa_ops[i].result_def); break; case ZEND_FE_FETCH_R: case ZEND_FE_FETCH_RW: + tmp = (t2 & MAY_BE_REF); if (t1 & MAY_BE_OBJECT) { if (opline->opcode == ZEND_FE_FETCH_RW) { - tmp = MAY_BE_REF | MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF; + tmp |= MAY_BE_REF | MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF; } else { - tmp = MAY_BE_REF | MAY_BE_RCN | MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF; + tmp |= MAY_BE_REF | MAY_BE_RCN | MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF; } - } else if (t1 & MAY_BE_ARRAY) { + } + if (t1 & MAY_BE_ARRAY) { if (opline->opcode == ZEND_FE_FETCH_RW) { - tmp = MAY_BE_REF | MAY_BE_RCN | MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF; + tmp |= MAY_BE_REF | MAY_BE_RCN | MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF; } else { - tmp = ((t1 & MAY_BE_ARRAY_OF_ANY) >> MAY_BE_ARRAY_SHIFT); + tmp |= ((t1 & MAY_BE_ARRAY_OF_ANY) >> MAY_BE_ARRAY_SHIFT); if (tmp & MAY_BE_ARRAY) { tmp |= MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF; } if (t1 & MAY_BE_ARRAY_OF_REF) { - tmp |= MAY_BE_REF | MAY_BE_RC1 | MAY_BE_RCN; - } else { + tmp |= MAY_BE_RC1 | MAY_BE_RCN; + } else if (tmp & (MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE)) { tmp |= MAY_BE_RC1 | MAY_BE_RCN; } } - } else { - if (opline->opcode == ZEND_FE_FETCH_RW) { - tmp = MAY_BE_REF; - } else { - tmp = MAY_BE_RCN; - } - } - if (opline->opcode == ZEND_FE_FETCH_R && (t2 & MAY_BE_REF)) { - tmp |= MAY_BE_REF; } UPDATE_SSA_TYPE(tmp, ssa_ops[i].op2_def); if (ssa_ops[i].result_def >= 0) { - tmp = MAY_BE_RC1; + tmp = 0; if (t1 & MAY_BE_OBJECT) { - tmp |= MAY_BE_RCN | MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF; - } else if (t1 & MAY_BE_ARRAY) { + tmp |= MAY_BE_RC1 | MAY_BE_RCN | MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF; + } + if (t1 & MAY_BE_ARRAY) { if (t1 & MAY_BE_ARRAY_KEY_LONG) { tmp |= MAY_BE_LONG; } if (t1 & MAY_BE_ARRAY_KEY_STRING) { - tmp |= MAY_BE_STRING; + tmp |= MAY_BE_STRING | MAY_BE_RCN; } } UPDATE_SSA_TYPE(tmp, ssa_ops[i].result_def); @@ -3203,22 +3244,22 @@ static void zend_update_type_info(const zend_op_array *op_array, case ZEND_FETCH_DIM_FUNC_ARG: case ZEND_FETCH_LIST: if (ssa_ops[i].op1_def >= 0) { - tmp = t1; + tmp = t1 & ~(MAY_BE_RC1|MAY_BE_RCN); if (opline->opcode == ZEND_FETCH_DIM_W || opline->opcode == ZEND_FETCH_DIM_RW || opline->opcode == ZEND_FETCH_DIM_FUNC_ARG) { - if (opline->opcode != ZEND_FETCH_DIM_FUNC_ARG) { - tmp &= ~MAY_BE_UNDEF; - if (t1 & (MAY_BE_UNDEF | MAY_BE_NULL)) { - tmp &= ~MAY_BE_NULL; - tmp |= MAY_BE_ARRAY; - } else if (t1 & (MAY_BE_FALSE|MAY_BE_STRING)) { - tmp |= MAY_BE_ARRAY; + if (t1 & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE)) { + if (opline->opcode != ZEND_FETCH_DIM_FUNC_ARG) { + tmp &= ~(MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE); } + tmp |= MAY_BE_ARRAY | MAY_BE_RC1; } - if (tmp & MAY_BE_RCN) { + if (t1 & (MAY_BE_STRING|MAY_BE_ARRAY)) { tmp |= MAY_BE_RC1; } + if (t1 & (MAY_BE_OBJECT|MAY_BE_RESOURCE)) { + tmp |= t1 & (MAY_BE_RC1|MAY_BE_RCN); + } if (opline->op2_type == IS_UNUSED) { tmp |= MAY_BE_ARRAY_KEY_LONG; } else { @@ -3342,17 +3383,11 @@ static void zend_update_type_info(const zend_op_array *op_array, opline->opcode == ZEND_FETCH_OBJ_RW || opline->opcode == ZEND_FETCH_OBJ_FUNC_ARG) { if (opline->opcode != ZEND_FETCH_DIM_FUNC_ARG) { - tmp &= ~MAY_BE_UNDEF; - if (t1 & (MAY_BE_UNDEF | MAY_BE_NULL)) { - tmp &= ~MAY_BE_NULL; - tmp |= MAY_BE_OBJECT; - } else if (t1 & (MAY_BE_FALSE|MAY_BE_STRING)) { - tmp |= MAY_BE_OBJECT; + if (t1 & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_NULL)) { + tmp &= ~(MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE); + tmp |= MAY_BE_OBJECT | MAY_BE_RC1 | MAY_BE_RCN; } } - if (tmp & MAY_BE_RCN) { - tmp |= MAY_BE_RC1; - } } UPDATE_SSA_TYPE(tmp, ssa_ops[i].op1_def); COPY_SSA_OBJ_TYPE(ssa_ops[i].op1_use, ssa_ops[i].op1_def); @@ -3363,7 +3398,7 @@ static void zend_update_type_info(const zend_op_array *op_array, tmp |= MAY_BE_ERROR; } if (opline->result_type == IS_TMP_VAR) { - tmp |= MAY_BE_RC1; + tmp |= MAY_BE_RC1 | MAY_BE_RCN; } else { tmp |= MAY_BE_REF | MAY_BE_RC1 | MAY_BE_RCN; } @@ -3406,7 +3441,7 @@ static void zend_update_type_info(const zend_op_array *op_array, UPDATE_SSA_TYPE(MAY_BE_RC1|MAY_BE_RCN|MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_STRING|MAY_BE_RESOURCE|MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_ANY|MAY_BE_ARRAY_OF_ANY, ssa_ops[i].result_def); break; case ZEND_STRLEN: - tmp = MAY_BE_RC1|MAY_BE_LONG; + tmp = MAY_BE_LONG; if (t1 & (MAY_BE_ANY - (MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_LONG|MAY_BE_DOUBLE|MAY_BE_STRING))) { tmp |= MAY_BE_NULL; } @@ -3414,14 +3449,16 @@ static void zend_update_type_info(const zend_op_array *op_array, break; case ZEND_TYPE_CHECK: case ZEND_DEFINED: - UPDATE_SSA_TYPE(MAY_BE_RC1|MAY_BE_FALSE|MAY_BE_TRUE, ssa_ops[i].result_def); + UPDATE_SSA_TYPE(MAY_BE_FALSE|MAY_BE_TRUE, ssa_ops[i].result_def); break; case ZEND_VERIFY_RETURN_TYPE: { zend_arg_info *ret_info = op_array->arg_info - 1; tmp = zend_fetch_arg_info(script, ret_info, &ce); - tmp |= MAY_BE_RC1 | MAY_BE_RCN; + if (tmp & (MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE)) { + tmp |= MAY_BE_RC1 | MAY_BE_RCN; + } if (opline->op1_type & (IS_TMP_VAR|IS_VAR|IS_CV)) { UPDATE_SSA_TYPE(tmp, ssa_ops[i].op1_def); if (ce) { @@ -3453,7 +3490,7 @@ unknown_opcode: if (ssa_ops[i].result_def >= 0) { tmp = MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF; if (opline->result_type == IS_TMP_VAR) { - tmp |= MAY_BE_RC1; + tmp |= MAY_BE_RC1 | MAY_BE_RCN; } else { tmp |= MAY_BE_REF | MAY_BE_RC1 | MAY_BE_RCN; } @@ -3888,7 +3925,9 @@ void zend_func_return_info(const zend_op_array *op_array, t1 |= MAY_BE_NULL; } if (opline->opcode == ZEND_RETURN) { - t1 |= MAY_BE_RC1 | MAY_BE_RCN; + if (t1 & MAY_BE_RC1) { + t1 |= MAY_BE_RCN; + } t1 &= ~(MAY_BE_UNDEF | MAY_BE_REF); } else { t1 |= MAY_BE_REF; @@ -4106,7 +4145,7 @@ int zend_ssa_inference(zend_arena **arena, const zend_op_array *op_array, const } } else { for (i = 0; i < op_array->last_var; i++) { - ssa_var_info[i].type = MAY_BE_UNDEF | MAY_BE_RCN; + ssa_var_info[i].type = MAY_BE_UNDEF; ssa_var_info[i].has_range = 0; } } diff --git a/ext/opcache/Optimizer/zend_inference.h b/ext/opcache/Optimizer/zend_inference.h index 6bf6809..4febc99 100644 --- a/ext/opcache/Optimizer/zend_inference.h +++ b/ext/opcache/Optimizer/zend_inference.h @@ -162,8 +162,13 @@ static zend_always_inline uint32_t _const_op_type(const zval *zv) { return MAY_BE_RC1 | MAY_BE_RCN | MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY; } else if (Z_TYPE_P(zv) == IS_ARRAY) { HashTable *ht = Z_ARRVAL_P(zv); - uint32_t tmp = MAY_BE_ARRAY | MAY_BE_RC1 | MAY_BE_RCN; + uint32_t tmp = MAY_BE_ARRAY; + if (Z_REFCOUNTED_P(zv)) { + tmp |= MAY_BE_RC1 | MAY_BE_RCN; + } else { + tmp |= MAY_BE_RCN; + } zend_string *str; zval *val; ZEND_HASH_FOREACH_STR_KEY_VAL(ht, str, val) { @@ -176,7 +181,14 @@ static zend_always_inline uint32_t _const_op_type(const zval *zv) { } ZEND_HASH_FOREACH_END(); return tmp; } else { - return (1 << Z_TYPE_P(zv)) | MAY_BE_RC1 | MAY_BE_RCN; + uint32_t tmp = (1 << Z_TYPE_P(zv)); + + if (Z_REFCOUNTED_P(zv)) { + tmp |= MAY_BE_RC1 | MAY_BE_RCN; + } else if (Z_TYPE_P(zv) == IS_STRING) { + tmp |= MAY_BE_RCN; + } + return tmp; } } diff --git a/ext/opcache/Optimizer/zend_ssa.c b/ext/opcache/Optimizer/zend_ssa.c index d4cb20e..9360793 100644 --- a/ext/opcache/Optimizer/zend_ssa.c +++ b/ext/opcache/Optimizer/zend_ssa.c @@ -654,6 +654,15 @@ static int zend_ssa_rename(const zend_op_array *op_array, uint32_t build_flags, //NEW_SSA_VAR(opline+->op1.var) } break; + case ZEND_SEND_VAR: + case ZEND_CAST: + if ((build_flags & ZEND_SSA_RC_INFERENCE) && opline->op1_type == IS_CV) { + ssa_ops[k].op1_def = ssa_vars_count; + var[EX_VAR_TO_NUM(opline->op1.var)] = ssa_vars_count; + ssa_vars_count++; + //NEW_SSA_VAR(opline->op1.var) + } + break; case ZEND_SEND_VAR_NO_REF: case ZEND_SEND_VAR_NO_REF_EX: case ZEND_SEND_VAR_EX:
« previous php.cvs (#94849) next »