From 603c74b4df6dcdbfc0eae48e505857dcc690b4fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= Date: Fri, 20 Dec 2019 15:04:00 +0100 Subject: [PATCH] Remove unnecessary FN type information from OPCache --- ext/opcache/Optimizer/zend_func_info.c | 44 -------------------------- 1 file changed, 44 deletions(-) diff --git a/ext/opcache/Optimizer/zend_func_info.c b/ext/opcache/Optimizer/zend_func_info.c index 988ceeb472642..b57e5e65eff51 100644 --- a/ext/opcache/Optimizer/zend_func_info.c +++ b/ext/opcache/Optimizer/zend_func_info.c @@ -91,9 +91,6 @@ static const func_info_t func_infos[] = { F1("zend_version", MAY_BE_STRING), 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), - FN("get_class", MAY_BE_FALSE | MAY_BE_STRING), - FN("get_called_class", MAY_BE_FALSE | MAY_BE_STRING), - FN("get_parent_class", MAY_BE_FALSE | MAY_BE_STRING), F1("get_class_vars", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF), FN("get_object_vars", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF), FN("get_mangled_object_vars", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF), @@ -126,8 +123,6 @@ static const func_info_t func_infos[] = { F1("wordwrap", MAY_BE_STRING), F1("htmlspecialchars", MAY_BE_STRING), F1("htmlentities", MAY_BE_STRING), - FN("html_entity_decode", MAY_BE_FALSE | MAY_BE_STRING), - FN("htmlspecialchars_decode", MAY_BE_FALSE | MAY_BE_STRING), F1("get_html_translation_table", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING), F1("sha1", MAY_BE_STRING), F1("sha1_file", MAY_BE_FALSE | MAY_BE_STRING), @@ -147,11 +142,8 @@ static const func_info_t func_infos[] = { F1("php_ini_scanned_files", MAY_BE_FALSE | MAY_BE_STRING), F1("php_ini_loaded_file", MAY_BE_FALSE | MAY_BE_STRING), F1("strtok", MAY_BE_FALSE | MAY_BE_STRING), - FN("strtoupper", MAY_BE_STRING), - FN("strtolower", MAY_BE_STRING), F1("strrev", MAY_BE_STRING), F1("hebrev", MAY_BE_STRING), - FN("nl2br", MAY_BE_STRING), F1("basename", MAY_BE_STRING), F1("dirname", MAY_BE_STRING), F1("pathinfo", MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING), @@ -164,29 +156,17 @@ static const func_info_t func_infos[] = { F1("str_word_count", MAY_BE_LONG | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), F1("str_split", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), F1("strpbrk", MAY_BE_FALSE | MAY_BE_STRING), - FN("substr", MAY_BE_FALSE | MAY_BE_STRING), FN("substr_replace", MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING), F1("quotemeta", MAY_BE_STRING), - FN("ucfirst", MAY_BE_STRING), - FN("lcfirst", MAY_BE_STRING), F1("ucwords", MAY_BE_STRING), - FN("strtr", MAY_BE_STRING), - FN("addslashes", MAY_BE_STRING), F1("addcslashes", MAY_BE_STRING), - FN("rtrim", MAY_BE_STRING), - FN("chop", MAY_BE_STRING), FN("str_replace", 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_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_STRING), F1("count_chars", MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_LONG), F1("chunk_split", MAY_BE_STRING), - FN("trim", MAY_BE_STRING), - FN("ltrim", MAY_BE_STRING), F1("strip_tags", MAY_BE_STRING), F1("explode", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), - FN("implode", MAY_BE_STRING), - FN("join", MAY_BE_STRING), - FN("setlocale", MAY_BE_FALSE | MAY_BE_STRING), F1("localeconv", 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_FALSE | MAY_BE_STRING), @@ -194,7 +174,6 @@ static const func_info_t func_infos[] = { F1("soundex", MAY_BE_FALSE | MAY_BE_STRING), F1("chr", MAY_BE_STRING), F1("str_getcsv", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_NULL | MAY_BE_ARRAY_OF_STRING), - FN("str_pad", MAY_BE_STRING), F1("strchr", MAY_BE_FALSE | MAY_BE_STRING), F1("sprintf", MAY_BE_STRING), F1("vsprintf", MAY_BE_STRING), @@ -282,9 +261,7 @@ static const func_info_t func_infos[] = { F1("show_source", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), F1("highlight_string", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_STRING), F1("php_strip_whitespace", MAY_BE_STRING), - FN("ini_get", MAY_BE_FALSE | MAY_BE_STRING), F1("ini_get_all", 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), - FN("ini_set", MAY_BE_FALSE | MAY_BE_STRING), F1("ini_alter", MAY_BE_FALSE | MAY_BE_STRING), F1("get_include_path", MAY_BE_FALSE | MAY_BE_STRING), F1("set_include_path", MAY_BE_FALSE | MAY_BE_STRING), @@ -305,8 +282,6 @@ static const func_info_t func_infos[] = { F1("dns_get_record", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_ARRAY), # endif #endif - FN("strval", MAY_BE_STRING), - FN("gettype", MAY_BE_STRING), F1("popen", MAY_BE_FALSE | MAY_BE_RESOURCE), F1("fgetc", MAY_BE_FALSE | MAY_BE_STRING), F1("fgets", MAY_BE_FALSE | MAY_BE_STRING), @@ -372,7 +347,6 @@ static const func_info_t func_infos[] = { F1("ob_get_flush", MAY_BE_FALSE | MAY_BE_STRING), F1("ob_get_clean", MAY_BE_FALSE | MAY_BE_STRING), F1("ob_get_status", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY), - FN("ob_get_contents", MAY_BE_FALSE | MAY_BE_STRING), F1("ob_list_handlers", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING), F0("array_walk", MAY_BE_TRUE), F0("array_walk_recursive", MAY_BE_TRUE), @@ -390,10 +364,8 @@ static const func_info_t func_infos[] = { 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), - FN("array_search", MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_STRING), F1("compact", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY), F1("array_fill", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_ANY), F1("array_fill_keys", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY), @@ -437,8 +409,6 @@ static const func_info_t func_infos[] = { FN("array_map", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY), F1("array_chunk", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY), F1("array_combine", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY), - FN("array_key_first", MAY_BE_NULL | MAY_BE_LONG | MAY_BE_STRING), - FN("array_key_last", MAY_BE_NULL | MAY_BE_LONG | MAY_BE_STRING), F1("pos", UNKNOWN_INFO), 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("str_rot13", MAY_BE_STRING), @@ -462,16 +432,8 @@ static const func_info_t func_infos[] = { F1("date_parse_from_format", 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_STRING), - FN("date_modify", MAY_BE_FALSE | MAY_BE_OBJECT), - FN("date_add", MAY_BE_OBJECT), - FN("date_sub", MAY_BE_OBJECT), F1("date_timezone_get", MAY_BE_FALSE | MAY_BE_OBJECT), - FN("date_timezone_set", MAY_BE_OBJECT), F1("date_diff", MAY_BE_OBJECT), - FN("date_time_set", MAY_BE_OBJECT), - FN("date_date_set", MAY_BE_OBJECT), - FN("date_isodate_set", MAY_BE_OBJECT), - FN("date_timestamp_set", MAY_BE_OBJECT), F1("timezone_open", MAY_BE_FALSE | MAY_BE_OBJECT), F1("timezone_name_get", MAY_BE_STRING), F1("timezone_name_from_abbr", MAY_BE_FALSE | MAY_BE_STRING), @@ -492,7 +454,6 @@ static const func_info_t func_infos[] = { FN("preg_replace_callback", MAY_BE_NULL | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING), F1("preg_filter", MAY_BE_NULL | 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 | MAY_BE_ARRAY_OF_ARRAY), - FN("preg_quote", 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), /* ext/mysqli */ @@ -600,7 +561,6 @@ static const func_info_t func_infos[] = { F1("curl_init", MAY_BE_FALSE | MAY_BE_RESOURCE), F1("curl_copy_handle", MAY_BE_FALSE | MAY_BE_RESOURCE), F1("curl_version", 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), - FN("curl_exec", MAY_BE_FALSE | MAY_BE_TRUE | 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_STRING), F1("curl_strerror", MAY_BE_NULL | MAY_BE_STRING), @@ -608,7 +568,6 @@ static const func_info_t func_infos[] = { F1("curl_escape", MAY_BE_FALSE | MAY_BE_STRING), F1("curl_unescape", MAY_BE_FALSE | MAY_BE_STRING), F1("curl_multi_init", MAY_BE_RESOURCE), - FN("curl_multi_getcontent", MAY_BE_NULL | MAY_BE_STRING), F1("curl_multi_info_read", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_RESOURCE), F1("curl_share_init", MAY_BE_RESOURCE), F1("curl_file_create", MAY_BE_OBJECT), @@ -668,8 +627,6 @@ static const func_info_t func_infos[] = { F1("json_last_error_msg", MAY_BE_STRING), /* ext/xml */ - FN("xml_parser_create", MAY_BE_FALSE | MAY_BE_OBJECT), - FN("xml_parser_create_ns", MAY_BE_FALSE | MAY_BE_OBJECT), F1("xml_error_string", MAY_BE_NULL | MAY_BE_STRING), F1("xml_parser_get_option", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_STRING), F1("utf8_encode", MAY_BE_STRING), @@ -781,7 +738,6 @@ static const func_info_t func_infos[] = { F1("session_name", MAY_BE_FALSE | MAY_BE_STRING), F1("session_module_name", MAY_BE_FALSE | MAY_BE_STRING), F1("session_save_path", MAY_BE_FALSE | MAY_BE_STRING), - FN("session_id", MAY_BE_FALSE | MAY_BE_STRING), F1("session_create_id", MAY_BE_FALSE | MAY_BE_STRING), F1("session_cache_limiter", MAY_BE_FALSE | MAY_BE_STRING), F1("session_encode", MAY_BE_FALSE | MAY_BE_STRING),