Skip to content

Commit d9eb97d

Browse files
kocsismatekocsismate
committed
Remove unnecessary FN type information from OPCache
GH-5029
1 parent f3d5a5a commit d9eb97d

File tree

1 file changed

+0
-44
lines changed

1 file changed

+0
-44
lines changed

‎ext/opcache/Optimizer/zend_func_info.c

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,6 @@ static const func_info_t func_infos[] = {
9191
F1("zend_version", MAY_BE_STRING),
9292
FN("func_get_arg", UNKNOWN_INFO),
9393
F1("func_get_args", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_ANY),
94-
FN("get_class", MAY_BE_FALSE | MAY_BE_STRING),
95-
FN("get_called_class", MAY_BE_FALSE | MAY_BE_STRING),
96-
FN("get_parent_class", MAY_BE_FALSE | MAY_BE_STRING),
9794
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),
9895
FN("get_object_vars", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF),
9996
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[] = {
126123
F1("wordwrap", MAY_BE_STRING),
127124
F1("htmlspecialchars", MAY_BE_STRING),
128125
F1("htmlentities", MAY_BE_STRING),
129-
FN("html_entity_decode", MAY_BE_FALSE | MAY_BE_STRING),
130-
FN("htmlspecialchars_decode", MAY_BE_FALSE | MAY_BE_STRING),
131126
F1("get_html_translation_table", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING),
132127
F1("sha1", MAY_BE_STRING),
133128
F1("sha1_file", MAY_BE_FALSE | MAY_BE_STRING),
@@ -147,11 +142,8 @@ static const func_info_t func_infos[] = {
147142
F1("php_ini_scanned_files", MAY_BE_FALSE | MAY_BE_STRING),
148143
F1("php_ini_loaded_file", MAY_BE_FALSE | MAY_BE_STRING),
149144
F1("strtok", MAY_BE_FALSE | MAY_BE_STRING),
150-
FN("strtoupper", MAY_BE_STRING),
151-
FN("strtolower", MAY_BE_STRING),
152145
F1("strrev", MAY_BE_STRING),
153146
F1("hebrev", MAY_BE_STRING),
154-
FN("nl2br", MAY_BE_STRING),
155147
F1("basename", MAY_BE_STRING),
156148
F1("dirname", MAY_BE_STRING),
157149
F1("pathinfo", MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING),
@@ -164,37 +156,24 @@ static const func_info_t func_infos[] = {
164156
F1("str_word_count", MAY_BE_LONG | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING),
165157
F1("str_split", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING),
166158
F1("strpbrk", MAY_BE_FALSE | MAY_BE_STRING),
167-
FN("substr", MAY_BE_FALSE | MAY_BE_STRING),
168159
FN("substr_replace", MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING),
169160
F1("quotemeta", MAY_BE_STRING),
170-
FN("ucfirst", MAY_BE_STRING),
171-
FN("lcfirst", MAY_BE_STRING),
172161
F1("ucwords", MAY_BE_STRING),
173-
FN("strtr", MAY_BE_STRING),
174-
FN("addslashes", MAY_BE_STRING),
175162
F1("addcslashes", MAY_BE_STRING),
176-
FN("rtrim", MAY_BE_STRING),
177-
FN("chop", MAY_BE_STRING),
178163
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),
179164
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),
180165
F1("str_repeat", MAY_BE_STRING),
181166
F1("count_chars", MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_LONG),
182167
F1("chunk_split", MAY_BE_STRING),
183-
FN("trim", MAY_BE_STRING),
184-
FN("ltrim", MAY_BE_STRING),
185168
F1("strip_tags", MAY_BE_STRING),
186169
F1("explode", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING),
187-
FN("implode", MAY_BE_STRING),
188-
FN("join", MAY_BE_STRING),
189-
FN("setlocale", MAY_BE_FALSE | MAY_BE_STRING),
190170
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),
191171
#if HAVE_NL_LANGINFO
192172
F1("nl_langinfo", MAY_BE_FALSE | MAY_BE_STRING),
193173
#endif
194174
F1("soundex", MAY_BE_FALSE | MAY_BE_STRING),
195175
F1("chr", MAY_BE_STRING),
196176
F1("str_getcsv", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_NULL | MAY_BE_ARRAY_OF_STRING),
197-
FN("str_pad", MAY_BE_STRING),
198177
F1("strchr", MAY_BE_FALSE | MAY_BE_STRING),
199178
F1("sprintf", MAY_BE_STRING),
200179
F1("vsprintf", MAY_BE_STRING),
@@ -282,9 +261,7 @@ static const func_info_t func_infos[] = {
282261
F1("show_source", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
283262
F1("highlight_string", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_STRING),
284263
F1("php_strip_whitespace", MAY_BE_STRING),
285-
FN("ini_get", MAY_BE_FALSE | MAY_BE_STRING),
286264
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),
287-
FN("ini_set", MAY_BE_FALSE | MAY_BE_STRING),
288265
F1("ini_alter", MAY_BE_FALSE | MAY_BE_STRING),
289266
F1("get_include_path", MAY_BE_FALSE | MAY_BE_STRING),
290267
F1("set_include_path", MAY_BE_FALSE | MAY_BE_STRING),
@@ -305,8 +282,6 @@ static const func_info_t func_infos[] = {
305282
F1("dns_get_record", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_ARRAY),
306283
# endif
307284
#endif
308-
FN("strval", MAY_BE_STRING),
309-
FN("gettype", MAY_BE_STRING),
310285
F1("popen", MAY_BE_FALSE | MAY_BE_RESOURCE),
311286
F1("fgetc", MAY_BE_FALSE | MAY_BE_STRING),
312287
F1("fgets", MAY_BE_FALSE | MAY_BE_STRING),
@@ -372,7 +347,6 @@ static const func_info_t func_infos[] = {
372347
F1("ob_get_flush", MAY_BE_FALSE | MAY_BE_STRING),
373348
F1("ob_get_clean", MAY_BE_FALSE | MAY_BE_STRING),
374349
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),
375-
FN("ob_get_contents", MAY_BE_FALSE | MAY_BE_STRING),
376350
F1("ob_list_handlers", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING),
377351
F0("array_walk", MAY_BE_TRUE),
378352
F0("array_walk_recursive", MAY_BE_TRUE),
@@ -390,10 +364,8 @@ static const func_info_t func_infos[] = {
390364
FN("next", UNKNOWN_INFO),
391365
FN("reset", UNKNOWN_INFO),
392366
FN("current", UNKNOWN_INFO),
393-
FN("key", MAY_BE_NULL | MAY_BE_LONG | MAY_BE_STRING),
394367
FN("min", UNKNOWN_INFO),
395368
FN("max", UNKNOWN_INFO),
396-
FN("array_search", MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_STRING),
397369
F1("compact", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY),
398370
F1("array_fill", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_ANY),
399371
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[] = {
437409
FN("array_map", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY),
438410
F1("array_chunk", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY),
439411
F1("array_combine", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY),
440-
FN("array_key_first", MAY_BE_NULL | MAY_BE_LONG | MAY_BE_STRING),
441-
FN("array_key_last", MAY_BE_NULL | MAY_BE_LONG | MAY_BE_STRING),
442412
F1("pos", UNKNOWN_INFO),
443413
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),
444414
F1("str_rot13", MAY_BE_STRING),
@@ -462,16 +432,8 @@ static const func_info_t func_infos[] = {
462432
F1("date_parse_from_format", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ANY),
463433
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),
464434
F1("date_format", MAY_BE_STRING),
465-
FN("date_modify", MAY_BE_FALSE | MAY_BE_OBJECT),
466-
FN("date_add", MAY_BE_OBJECT),
467-
FN("date_sub", MAY_BE_OBJECT),
468435
F1("date_timezone_get", MAY_BE_FALSE | MAY_BE_OBJECT),
469-
FN("date_timezone_set", MAY_BE_OBJECT),
470436
F1("date_diff", MAY_BE_OBJECT),
471-
FN("date_time_set", MAY_BE_OBJECT),
472-
FN("date_date_set", MAY_BE_OBJECT),
473-
FN("date_isodate_set", MAY_BE_OBJECT),
474-
FN("date_timestamp_set", MAY_BE_OBJECT),
475437
F1("timezone_open", MAY_BE_FALSE | MAY_BE_OBJECT),
476438
F1("timezone_name_get", MAY_BE_STRING),
477439
F1("timezone_name_from_abbr", MAY_BE_FALSE | MAY_BE_STRING),
@@ -492,7 +454,6 @@ static const func_info_t func_infos[] = {
492454
FN("preg_replace_callback", MAY_BE_NULL | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING),
493455
F1("preg_filter", MAY_BE_NULL | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING),
494456
F1("preg_split", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY),
495-
FN("preg_quote", MAY_BE_STRING),
496457
F1("preg_grep", MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_REF | MAY_BE_ARRAY_OF_ANY),
497458

498459
/* ext/mysqli */
@@ -600,15 +561,13 @@ static const func_info_t func_infos[] = {
600561
F1("curl_init", MAY_BE_FALSE | MAY_BE_RESOURCE),
601562
F1("curl_copy_handle", MAY_BE_FALSE | MAY_BE_RESOURCE),
602563
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),
603-
FN("curl_exec", MAY_BE_FALSE | MAY_BE_TRUE | MAY_BE_STRING),
604564
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),
605565
F1("curl_error", MAY_BE_STRING),
606566
F1("curl_strerror", MAY_BE_NULL | MAY_BE_STRING),
607567
F1("curl_multi_strerror", MAY_BE_NULL | MAY_BE_STRING),
608568
F1("curl_escape", MAY_BE_FALSE | MAY_BE_STRING),
609569
F1("curl_unescape", MAY_BE_FALSE | MAY_BE_STRING),
610570
F1("curl_multi_init", MAY_BE_RESOURCE),
611-
FN("curl_multi_getcontent", MAY_BE_NULL | MAY_BE_STRING),
612571
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),
613572
F1("curl_share_init", MAY_BE_RESOURCE),
614573
F1("curl_file_create", MAY_BE_OBJECT),
@@ -668,8 +627,6 @@ static const func_info_t func_infos[] = {
668627
F1("json_last_error_msg", MAY_BE_STRING),
669628

670629
/* ext/xml */
671-
FN("xml_parser_create", MAY_BE_FALSE | MAY_BE_OBJECT),
672-
FN("xml_parser_create_ns", MAY_BE_FALSE | MAY_BE_OBJECT),
673630
F1("xml_error_string", MAY_BE_NULL | MAY_BE_STRING),
674631
F1("xml_parser_get_option", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_STRING),
675632
F1("utf8_encode", MAY_BE_STRING),
@@ -781,7 +738,6 @@ static const func_info_t func_infos[] = {
781738
F1("session_name", MAY_BE_FALSE | MAY_BE_STRING),
782739
F1("session_module_name", MAY_BE_FALSE | MAY_BE_STRING),
783740
F1("session_save_path", MAY_BE_FALSE | MAY_BE_STRING),
784-
FN("session_id", MAY_BE_FALSE | MAY_BE_STRING),
785741
F1("session_create_id", MAY_BE_FALSE | MAY_BE_STRING),
786742
F1("session_cache_limiter", MAY_BE_FALSE | MAY_BE_STRING),
787743
F1("session_encode", MAY_BE_FALSE | MAY_BE_STRING),

0 commit comments

Comments
 (0)