From bf1cfc0753b09ba6c091626525aeaa596da1f5b6 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Mon, 16 Jan 2023 12:22:54 +0100 Subject: [PATCH] Revert GH-10300 Cf. . This reverts commit 68ada76f9a659745f572539b72afa06fa75a866f. his reverts commit 45384c6e201eda9963e2fcc18946a9446230a2d6. This reverts commit ef7fbfd71025f034b0bfcb413efd181ce798fc1b. This reverts commit 9b9ea0d7c696f2990a159b2a2dafbc04547dc10f. This reverts commit f15747c26be4a2330dc0cf3ea442f53f30f84cac. This reverts commit e883ba93c40827fafd7868517eb48e04569f76ab. This reverts commit 7e87551c3775d26e20b06a4032a00053db6452cc. This reverts commit 921274d2b8966641a00c0a767ae40ba7187bdffc. This reverts commit fc1f528e5e3ee45ab17ae8dcfad6a6422ff2002d. This reverts commit 0961715cdafb5d39124667ff94f3b56453ce71f1. This reverts commit a93f264526e1cdade71d887800c1c448c411bfdc. This reverts commit 72dd94e1c6d29203b8f6473317f626e6d6d6fbdc. This reverts commit 29b2dc89645e741f91cc920964432dccd2aaef14. This reverts commit 05c7653bba7571852f5ce6fc0d220a1a829bc4c0. This reverts commit 5190e5c260ee05e3f3c3d1168263a1a6637441d0. This reverts commit 6b55bf228cb2da8705737d414f394950a92d8aae. This reverts commit 184b4a12d3215d105720d005b31e365249e2eb21. This reverts commit 4c31b7888a561e920fd3889ba8d99368f3c2d9e6. This reverts commit d44e9680f080b4918cfed268b96f90ea35975617. This reverts commit 4069a5c43f419d76e1254c8e49b4cad9968a408f. --- Zend/zend_API.c | 8 +++++--- Zend/zend_API.h | 12 ++++++------ Zend/zend_ast.c | 10 +++++----- Zend/zend_ast.h | 4 +--- Zend/zend_call_stack.c | 6 +++--- Zend/zend_call_stack.h | 6 ++---- Zend/zend_closures.c | 11 +++++++---- Zend/zend_closures.h | 9 --------- Zend/zend_compile.c | 28 ++++++++++++++-------------- Zend/zend_compile.h | 10 ++++++---- Zend/zend_enum.c | 10 +++++----- Zend/zend_enum.h | 7 ++----- Zend/zend_execute.h | 7 +++++-- Zend/zend_gc.c | 11 +++-------- Zend/zend_gc.h | 3 --- Zend/zend_globals_macros.h | 2 -- Zend/zend_inheritance.c | 1 - Zend/zend_interfaces.c | 4 +--- Zend/zend_interfaces.h | 8 ++------ Zend/zend_iterators.c | 6 ++---- Zend/zend_iterators.h | 7 ------- Zend/zend_language_scanner.h | 8 -------- Zend/zend_language_scanner.l | 3 +-- Zend/zend_list.c | 8 +++----- Zend/zend_list.h | 8 ++------ Zend/zend_llist.c | 2 +- Zend/zend_llist.h | 2 -- Zend/zend_objects.c | 15 +++++++-------- Zend/zend_objects.h | 5 +---- Zend/zend_objects_API.c | 3 +-- Zend/zend_objects_API.h | 8 ++------ Zend/zend_observer.c | 6 +++--- Zend/zend_observer.h | 12 +++--------- Zend/zend_weakrefs.c | 6 +++--- Zend/zend_weakrefs.h | 3 +-- ext/opcache/ZendAccelerator.h | 1 - main/php.h | 2 -- 37 files changed, 97 insertions(+), 165 deletions(-) diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 6c42d274c0d..c06d6119b7a 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -19,13 +19,15 @@ +----------------------------------------------------------------------+ */ +#include "zend.h" +#include "zend_execute.h" #include "zend_API.h" -#include "zend_arena.h" -#include "zend_objects.h" // for zend_objects_new() +#include "zend_modules.h" #include "zend_extensions.h" #include "zend_constants.h" -#include "zend_interfaces.h" // for zend_ce_stringable +#include "zend_interfaces.h" #include "zend_exceptions.h" +#include "zend_closures.h" #include "zend_inheritance.h" #include "zend_ini.h" #include "zend_enum.h" diff --git a/Zend/zend_API.h b/Zend/zend_API.h index 44ea4eaf878..cbc455eaab0 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -22,13 +22,13 @@ #ifndef ZEND_API_H #define ZEND_API_H -#include "zend_compile.h" // for zif_handler -#include "zend_execute.h" // for get_active_function_or_method_name() -#include "zend_globals.h" // for struct _zend_compiler_globals used by ZEND_MAP_PTR_GET_IMM() -#include "zend_globals_macros.h" // for CG() used by ZEND_MAP_PTR_GET_IMM() -#include "zend_portability.h" // for BEGIN_EXTERN_C +#include "zend_modules.h" +#include "zend_list.h" +#include "zend_operators.h" +#include "zend_variables.h" +#include "zend_execute.h" +#include "zend_type_info.h" -typedef struct _zend_module_entry zend_module_entry; BEGIN_EXTERN_C() diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index 0581714ab1e..70646856d3a 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -18,13 +18,13 @@ */ #include "zend_ast.h" -#include "zend_API.h" // for array_set_zval_key -#include "zend_arena.h" +#include "zend_API.h" +#include "zend_operators.h" +#include "zend_language_parser.h" +#include "zend_smart_str.h" +#include "zend_exceptions.h" #include "zend_constants.h" #include "zend_enum.h" -#include "zend_language_parser.h" // for T_* -#include "zend_smart_str.h" -#include "zend_exceptions.h" // for zend_throw_error ZEND_API zend_ast_process_t zend_ast_process = NULL; diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h index 7fc6bef2896..b5df2a55a20 100644 --- a/Zend/zend_ast.h +++ b/Zend/zend_ast.h @@ -21,9 +21,7 @@ #ifndef ZEND_AST_H #define ZEND_AST_H -#include "zend_types.h" // for zval - -#include +#include "zend.h" #ifndef ZEND_AST_SPEC # define ZEND_AST_SPEC 1 diff --git a/Zend/zend_call_stack.c b/Zend/zend_call_stack.c index 738dfbec517..dadaa60dcb2 100644 --- a/Zend/zend_call_stack.c +++ b/Zend/zend_call_stack.c @@ -18,11 +18,11 @@ /* Inspired from Chromium's stack_util.cc */ -#include "zend_call_stack.h" +#include "zend.h" #include "zend_globals.h" - +#include "zend_portability.h" +#include "zend_call_stack.h" #include - #ifdef ZEND_WIN32 # include # include diff --git a/Zend/zend_call_stack.h b/Zend/zend_call_stack.h index 96c0220525b..c71395bd6d4 100644 --- a/Zend/zend_call_stack.h +++ b/Zend/zend_call_stack.h @@ -19,14 +19,12 @@ #ifndef ZEND_CALL_STACK_H #define ZEND_CALL_STACK_H -#include "zend_portability.h" // for zend_always_inline - +#include "zend.h" +#include "zend_portability.h" #ifdef __APPLE__ # include #endif -#include - #ifdef ZEND_CHECK_STACK_LIMIT typedef struct _zend_call_stack { diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c index 03601ce3fc7..4c326a6c79b 100644 --- a/Zend/zend_closures.c +++ b/Zend/zend_closures.c @@ -18,11 +18,14 @@ +----------------------------------------------------------------------+ */ +#include "zend.h" +#include "zend_API.h" #include "zend_closures.h" -#include "zend_API.h" //for ZEND_METHOD() -#include "zend_arena.h" -#include "zend_compile.h" // for union _zend_function -#include "zend_objects.h" // for zend_object_std_init() +#include "zend_exceptions.h" +#include "zend_interfaces.h" +#include "zend_objects.h" +#include "zend_objects_API.h" +#include "zend_globals.h" #include "zend_closures_arginfo.h" typedef struct _zend_closure { diff --git a/Zend/zend_closures.h b/Zend/zend_closures.h index 40cb0a36ca3..2d093fa6168 100644 --- a/Zend/zend_closures.h +++ b/Zend/zend_closures.h @@ -20,15 +20,6 @@ #ifndef ZEND_CLOSURES_H #define ZEND_CLOSURES_H -#include "zend_portability.h" // for BEGIN_EXTERN_C - -typedef struct _zend_class_entry zend_class_entry; -typedef struct _zend_execute_data zend_execute_data; -typedef union _zend_function zend_function; -typedef struct _zend_object zend_object; -typedef struct _zend_string zend_string; -typedef struct _zval_struct zval; - BEGIN_EXTERN_C() /* This macro depends on zend_closure structure layout */ diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 166d94dc0dd..4cb9b9c8530 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -18,23 +18,23 @@ +----------------------------------------------------------------------+ */ -#include "zend_compile.h" -#include "zend_API.h" // for zend_get_object_type() -#include "zend_arena.h" +#include +#include "zend.h" #include "zend_attributes.h" +#include "zend_compile.h" #include "zend_constants.h" -#include "zend_enum.h" -#include "zend_exceptions.h" // for zend_throw_exception_ex() -#include "zend_globals.h" // struct _zend_compiler_globals -#include "zend_globals_macros.h" // for CG() -#include "zend_inheritance.h" // for zend_do_link_class() -#include "zend_language_parser.h" +#include "zend_llist.h" +#include "zend_API.h" +#include "zend_exceptions.h" +#include "zend_interfaces.h" +#include "zend_virtual_cwd.h" +#include "zend_multibyte.h" #include "zend_language_scanner.h" -#include "zend_list.h" // for zend_init_rsrc_list() -#include "zend_observer.h" // for zend_observer_function_declared_notify() -#include "zend_type_info.h" // for MAY_BE_* -#include "zend_virtual_cwd.h" // for IS_SLASH_P, DEFAULT_SLASH -#include "zend_vm.h" // for ZEND_VM_SET_OPCODE_HANDLER() +#include "zend_inheritance.h" +#include "zend_vm.h" +#include "zend_enum.h" +#include "zend_observer.h" +#include "zend_call_stack.h" #define SET_NODE(target, src) do { \ target ## _type = (src)->op_type; \ diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 6f7a7d42101..fa9e582869f 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -20,12 +20,12 @@ #ifndef ZEND_COMPILE_H #define ZEND_COMPILE_H -#include "zend.h" // for INTERNAL_FUNCTION_PARAMETERS +#include "zend.h" #include "zend_ast.h" -#include "zend_portability.h" //for ZEND_FASTCALL -#include "zend_types.h" // for zend_uchar -#include +#include + +#include "zend_llist.h" #define SET_UNUSED(op) do { \ op ## _type = IS_UNUSED; \ @@ -758,6 +758,8 @@ struct _zend_execute_data { #define ZEND_EXTRA_VALUE 1 +#include "zend_globals.h" + typedef enum _zend_compile_position { ZEND_COMPILE_POSITION_AT_SHEBANG = 0, ZEND_COMPILE_POSITION_AT_OPEN_TAG, diff --git a/Zend/zend_enum.c b/Zend/zend_enum.c index 11c62d83e1a..3e455b702cb 100644 --- a/Zend/zend_enum.c +++ b/Zend/zend_enum.c @@ -16,13 +16,13 @@ +----------------------------------------------------------------------+ */ -#include "zend_enum.h" -#include "zend_arena.h" // ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX2 -#include "zend_API.h" // for INIT_CLASS_ENTRY_EX() +#include "zend.h" +#include "zend_API.h" +#include "zend_compile.h" #include "zend_enum_arginfo.h" #include "zend_interfaces.h" -#include "zend_extensions.h" // for zend_internal_run_time_cache_reserved_size() -#include "zend_objects.h" // for zend_objects_new() +#include "zend_enum.h" +#include "zend_extensions.h" #include "zend_observer.h" #define ZEND_ENUM_DISALLOW_MAGIC_METHOD(propertyName, methodName) \ diff --git a/Zend/zend_enum.h b/Zend/zend_enum.h index 895100f0922..dbb230c4175 100644 --- a/Zend/zend_enum.h +++ b/Zend/zend_enum.h @@ -19,11 +19,8 @@ #ifndef ZEND_ENUM_H #define ZEND_ENUM_H -#include "zend_compile.h" // for OBJ_PROP_NUM -#include "zend_portability.h" // for BEGIN_EXTERN_C - -typedef struct _zend_class_entry zend_class_entry; -typedef struct _zend_function_entry zend_function_entry; +#include "zend.h" +#include "zend_types.h" BEGIN_EXTERN_C() diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h index e232b31c99d..40dc4b87f9b 100644 --- a/Zend/zend_execute.h +++ b/Zend/zend_execute.h @@ -22,12 +22,15 @@ #define ZEND_EXECUTE_H #include "zend_compile.h" // for zend_op_array -#include "zend_globals.h" // for struct _zend_executor_globals -#include "zend_globals_macros.h" // for EG() #include "zend_list.h" // for zend_rsrc_list_get_rsrc_type() #include "zend_portability.h" // for BEGIN_EXTERN_C #include "zend_types.h" // for zend_execute_data +#if ZEND_DEBUG +#include "zend_globals.h" // for struct _zend_executor_globals +#include "zend_globals_macros.h" // for EG() +#endif + BEGIN_EXTERN_C() struct _zend_fcall_info; ZEND_API extern void (*zend_execute_ex)(zend_execute_data *execute_data); diff --git a/Zend/zend_gc.c b/Zend/zend_gc.c index ccd75a0706b..66324672b1e 100644 --- a/Zend/zend_gc.c +++ b/Zend/zend_gc.c @@ -66,14 +66,9 @@ * * @see http://researcher.watson.ibm.com/researcher/files/us-bacon/Bacon01Concurrent.pdf */ - -#include "zend_gc.h" -#include "zend_alloc.h" // for ZEND_MM_OVERHEAD -#include "zend_fibers.h" // for zend_fiber_switch_block() -#include "zend_globals.h" // for struct _zend_executor_globals -#include "zend_globals_macros.h" // for EG() -#include "zend_objects.h" // for zend_objects_destroy_object() -#include "zend.h" // for zend_error() +#include "zend.h" +#include "zend_API.h" +#include "zend_fibers.h" #ifndef GC_BENCH # define GC_BENCH 0 diff --git a/Zend/zend_gc.h b/Zend/zend_gc.h index 0ee7e38460e..0589e193f4a 100644 --- a/Zend/zend_gc.h +++ b/Zend/zend_gc.h @@ -20,9 +20,6 @@ #ifndef ZEND_GC_H #define ZEND_GC_H -#include "zend_portability.h" // for BEGIN_EXTERN_C -#include "zend_types.h" // for GC_TYPE_INFO() - BEGIN_EXTERN_C() typedef struct _zend_gc_status { diff --git a/Zend/zend_globals_macros.h b/Zend/zend_globals_macros.h index 60e8def86d5..59b3daca53f 100644 --- a/Zend/zend_globals_macros.h +++ b/Zend/zend_globals_macros.h @@ -20,8 +20,6 @@ #ifndef ZEND_GLOBALS_MACROS_H #define ZEND_GLOBALS_MACROS_H -#include "zend_portability.h" // for BEGIN_EXTERN_C - typedef struct _zend_compiler_globals zend_compiler_globals; typedef struct _zend_executor_globals zend_executor_globals; typedef struct _zend_php_scanner_globals zend_php_scanner_globals; diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index 29141125a59..b45c16ef915 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -18,7 +18,6 @@ */ #include "zend.h" -#include "zend_arena.h" #include "zend_API.h" #include "zend_compile.h" #include "zend_execute.h" diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c index 52cc476578b..d05310b737b 100644 --- a/Zend/zend_interfaces.c +++ b/Zend/zend_interfaces.c @@ -16,13 +16,11 @@ +----------------------------------------------------------------------+ */ -#include "zend_interfaces.h" #include "zend.h" #include "zend_API.h" -#include "zend_arena.h" +#include "zend_interfaces.h" #include "zend_exceptions.h" #include "zend_interfaces_arginfo.h" -#include "zend_objects.h" // for zend_object_std_init() ZEND_API zend_class_entry *zend_ce_traversable; ZEND_API zend_class_entry *zend_ce_aggregate; diff --git a/Zend/zend_interfaces.h b/Zend/zend_interfaces.h index e8291213d7f..883e482f510 100644 --- a/Zend/zend_interfaces.h +++ b/Zend/zend_interfaces.h @@ -19,12 +19,8 @@ #ifndef ZEND_INTERFACES_H #define ZEND_INTERFACES_H -#include "zend_iterators.h" // for zend_object_iterator -#include "zend_portability.h" // for BEGIN_EXTERN_C - -typedef struct _zend_class_entry zend_class_entry; -typedef struct _zend_serialize_data zend_serialize_data; -typedef struct _zend_unserialize_data zend_unserialize_data; +#include "zend.h" +#include "zend_API.h" BEGIN_EXTERN_C() diff --git a/Zend/zend_iterators.c b/Zend/zend_iterators.c index fd5a0895b2a..f67033b1116 100644 --- a/Zend/zend_iterators.c +++ b/Zend/zend_iterators.c @@ -17,10 +17,8 @@ +----------------------------------------------------------------------+ */ -#include "zend_iterators.h" -#include "zend_objects.h" -#include "zend_object_handlers.h" -#include "zend_API.h" // for INIT_CLASS_ENTRY +#include "zend.h" +#include "zend_API.h" static zend_class_entry zend_iterator_class_entry; diff --git a/Zend/zend_iterators.h b/Zend/zend_iterators.h index 98337961948..5e7451f7eac 100644 --- a/Zend/zend_iterators.h +++ b/Zend/zend_iterators.h @@ -17,11 +17,6 @@ +----------------------------------------------------------------------+ */ -#ifndef ZEND_ITERATORS_H -#define ZEND_ITERATORS_H - -#include "zend_types.h" // for zval - /* These iterators were designed to operate within the foreach() * structures provided by the engine, but could be extended for use * with other iterative engine opcodes. @@ -94,5 +89,3 @@ ZEND_API void zend_iterator_dtor(zend_object_iterator *iter); ZEND_API void zend_register_iterator_wrapper(void); END_EXTERN_C() - -#endif /* ZEND_ITERATORS_H */ diff --git a/Zend/zend_language_scanner.h b/Zend/zend_language_scanner.h index c93b0fea56e..ca32329a557 100644 --- a/Zend/zend_language_scanner.h +++ b/Zend/zend_language_scanner.h @@ -20,14 +20,6 @@ #ifndef ZEND_SCANNER_H #define ZEND_SCANNER_H -#include "zend_globals.h" // for zend_php_scanner_event -#include "zend_multibyte.h" // for zend_encoding_filter -#include "zend_portability.h" // for BEGIN_EXTERN_C -#include "zend_ptr_stack.h" -#include "zend_stack.h" - -typedef struct _zend_file_handle zend_file_handle; - typedef struct _zend_lex_state { unsigned int yy_leng; unsigned char *yy_start; diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index c1ba518ddfb..c73a50948d6 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -27,7 +27,6 @@ # define YYDEBUG(s, c) #endif -#include "zend_language_scanner.h" #include "zend_language_scanner_defs.h" #include @@ -36,9 +35,9 @@ # include #endif #include "zend_alloc.h" -#include "zend_arena.h" #include #include "zend_compile.h" +#include "zend_language_scanner.h" #include "zend_highlight.h" #include "zend_constants.h" #include "zend_variables.h" diff --git a/Zend/zend_list.c b/Zend/zend_list.c index 6b2742c6808..51ef3e1d92e 100644 --- a/Zend/zend_list.c +++ b/Zend/zend_list.c @@ -19,12 +19,10 @@ /* resource lists */ +#include "zend.h" #include "zend_list.h" -#include "zend_execute.h" // for get_active_class_name() -#include "zend_globals.h" // for struct _zend_executor_globals -#include "zend_globals_macros.h" // for EG() -#include "zend_hash.h" -#include "zend_types.h" // for zval +#include "zend_API.h" +#include "zend_globals.h" ZEND_API int le_index_ptr; diff --git a/Zend/zend_list.h b/Zend/zend_list.h index 643abe65023..680915121e2 100644 --- a/Zend/zend_list.h +++ b/Zend/zend_list.h @@ -20,12 +20,8 @@ #ifndef ZEND_LIST_H #define ZEND_LIST_H -#include "zend_portability.h" // for BEGIN_EXTERN_C - -typedef struct _zend_array HashTable; -typedef struct _zend_resource zend_resource; -typedef struct _zend_string zend_string; -typedef struct _zval_struct zval; +#include "zend_hash.h" +#include "zend_globals.h" BEGIN_EXTERN_C() diff --git a/Zend/zend_llist.c b/Zend/zend_llist.c index cdc018ae627..8c42b2494ea 100644 --- a/Zend/zend_llist.c +++ b/Zend/zend_llist.c @@ -17,8 +17,8 @@ +----------------------------------------------------------------------+ */ +#include "zend.h" #include "zend_llist.h" -#include "zend_alloc.h" //for pemalloc() #include "zend_sort.h" ZEND_API void zend_llist_init(zend_llist *l, size_t size, llist_dtor_func_t dtor, unsigned char persistent) diff --git a/Zend/zend_llist.h b/Zend/zend_llist.h index e68be3cb201..cce5ad5ce95 100644 --- a/Zend/zend_llist.h +++ b/Zend/zend_llist.h @@ -20,8 +20,6 @@ #ifndef ZEND_LLIST_H #define ZEND_LLIST_H -#include "zend_portability.h" // for BEGIN_EXTERN_C - typedef struct _zend_llist_element { struct _zend_llist_element *next; struct _zend_llist_element *prev; diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c index f82f577df51..df76fa0bb8d 100644 --- a/Zend/zend_objects.c +++ b/Zend/zend_objects.c @@ -18,14 +18,13 @@ +----------------------------------------------------------------------+ */ -#include "zend_objects.h" -#include "zend_objects_API.h" -#include "zend_exceptions.h" // for zend_rethrow_exception() -#include "zend_execute.h" // for ZEND_REF_HAS_TYPE_SOURCES -#include "zend_types.h" // for GC_SET_REFCOUNT() -#include "zend_weakrefs.h" // for zend_weakrefs_notify() -#include "zend.h" // for struct _zend_class_entry -#include "zend_API.h" // for zend_call_known_instance_method_with_0_params() +#include "zend.h" +#include "zend_globals.h" +#include "zend_variables.h" +#include "zend_API.h" +#include "zend_interfaces.h" +#include "zend_exceptions.h" +#include "zend_weakrefs.h" static zend_always_inline void _zend_object_std_init(zend_object *object, zend_class_entry *ce) { diff --git a/Zend/zend_objects.h b/Zend/zend_objects.h index c998e9c60a2..91d388154dd 100644 --- a/Zend/zend_objects.h +++ b/Zend/zend_objects.h @@ -20,10 +20,7 @@ #ifndef ZEND_OBJECTS_H #define ZEND_OBJECTS_H -#include "zend_portability.h" // for BEGIN_EXTERN_C - -typedef struct _zend_class_entry zend_class_entry; -typedef struct _zend_object zend_object; +#include "zend.h" BEGIN_EXTERN_C() ZEND_API void ZEND_FASTCALL zend_object_std_init(zend_object *object, zend_class_entry *ce); diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c index 140219c0777..80f5b747db7 100644 --- a/Zend/zend_objects_API.c +++ b/Zend/zend_objects_API.c @@ -18,12 +18,11 @@ +----------------------------------------------------------------------+ */ -#include "zend_objects_API.h" -#include "zend_objects.h" // for zend_objects_destroy_object() #include "zend.h" #include "zend_globals.h" #include "zend_variables.h" #include "zend_API.h" +#include "zend_objects_API.h" #include "zend_fibers.h" ZEND_API void ZEND_FASTCALL zend_objects_store_init(zend_objects_store *objects, uint32_t init_size) diff --git a/Zend/zend_objects_API.h b/Zend/zend_objects_API.h index c643a250ce7..7a9a3a00082 100644 --- a/Zend/zend_objects_API.h +++ b/Zend/zend_objects_API.h @@ -20,12 +20,8 @@ #ifndef ZEND_OBJECTS_API_H #define ZEND_OBJECTS_API_H -#include "zend_portability.h" // for BEGIN_EXTERN_C -#include "zend_gc.h" // for GC_MAY_LEAK -#include "zend_compile.h" // for ZEND_ACC_USE_GUARDS -#include "zend.h" // for _zend_class_entry - -typedef struct _zend_object zend_object; +#include "zend.h" +#include "zend_compile.h" #define OBJ_BUCKET_INVALID (1<<0) diff --git a/Zend/zend_observer.c b/Zend/zend_observer.c index 7ff183f0efa..79929bfdd80 100644 --- a/Zend/zend_observer.c +++ b/Zend/zend_observer.c @@ -18,10 +18,10 @@ */ #include "zend_observer.h" -#include "zend_fibers.h" -#include "zend_extensions.h" // for zend_get_op_array_extension_handles() + +#include "zend_extensions.h" #include "zend_llist.h" -#include "zend_vm.h" // for ZEND_VM_SET_OPCODE_HANDLER() +#include "zend_vm.h" #define ZEND_OBSERVER_DATA(function) \ ZEND_OP_ARRAY_EXTENSION((&(function)->common), zend_observer_fcall_op_array_extension) diff --git a/Zend/zend_observer.h b/Zend/zend_observer.h index 8c5b20b3495..fc4d9a62c89 100644 --- a/Zend/zend_observer.h +++ b/Zend/zend_observer.h @@ -20,15 +20,9 @@ #ifndef ZEND_OBSERVER_H #define ZEND_OBSERVER_H -#include "zend_portability.h" // for BEGIN_EXTERN_C - -typedef struct _zend_class_entry zend_class_entry; -typedef struct _zend_execute_data zend_execute_data; -typedef struct _zend_fiber_context zend_fiber_context; -typedef union _zend_function zend_function; -typedef struct _zend_op_array zend_op_array; -typedef struct _zend_string zend_string; -typedef struct _zval_struct zval; +#include "zend.h" +#include "zend_compile.h" +#include "zend_fibers.h" BEGIN_EXTERN_C() diff --git a/Zend/zend_weakrefs.c b/Zend/zend_weakrefs.c index 19cbe6fa37e..db95b13a725 100644 --- a/Zend/zend_weakrefs.c +++ b/Zend/zend_weakrefs.c @@ -14,11 +14,11 @@ +----------------------------------------------------------------------+ */ +#include "zend.h" +#include "zend_interfaces.h" +#include "zend_objects_API.h" #include "zend_weakrefs.h" -#include "zend_API.h" // for ZEND_BEGIN_ARG_INFO_EX -#include "zend_objects.h" // for zend_object_std_init() #include "zend_weakrefs_arginfo.h" -#include "zend_interfaces.h" // for zend_create_internal_iterator_zval() typedef struct _zend_weakref { zend_object *referent; diff --git a/Zend/zend_weakrefs.h b/Zend/zend_weakrefs.h index 6e3f108646c..506e2e9d40c 100644 --- a/Zend/zend_weakrefs.h +++ b/Zend/zend_weakrefs.h @@ -17,8 +17,7 @@ #ifndef ZEND_WEAKREFS_H #define ZEND_WEAKREFS_H -#include "zend_portability.h" // for BEGIN_EXTERN_C -#include "zend_types.h" // for zval +#include "zend_alloc.h" BEGIN_EXTERN_C() diff --git a/ext/opcache/ZendAccelerator.h b/ext/opcache/ZendAccelerator.h index 5cda73bb1d6..6ecc2c2bc9d 100644 --- a/ext/opcache/ZendAccelerator.h +++ b/ext/opcache/ZendAccelerator.h @@ -50,7 +50,6 @@ #include "zend_extensions.h" #include "zend_compile.h" -#include "zend_modules.h" // for INIT_FUNC_ARGS #include "Optimizer/zend_optimizer.h" #include "zend_accelerator_hash.h" diff --git a/main/php.h b/main/php.h index cb1ab5ea7c8..b7101ed22f0 100644 --- a/main/php.h +++ b/main/php.h @@ -29,8 +29,6 @@ #include "php_version.h" #include "zend.h" -#include "zend_arena.h" -#include "zend_objects.h" #include "zend_sort.h" #include "php_compat.h"