include cleanup part 5

Zend/Optimizer/block_pass.c

@@ -22,6 +22,7 @@
 #include "Optimizer/zend_optimizer.h"
 #include "Optimizer/zend_optimizer_internal.h"
 #include "zend_API.h"
+#include "zend_arena.h"
 #include "zend_constants.h"
 #include "zend_execute.h"
 #include "zend_vm.h"

Zend/Optimizer/compact_literals.c

@@ -23,6 +23,7 @@
 
 #include "Optimizer/zend_optimizer.h"
 #include "Optimizer/zend_optimizer_internal.h"
+#include "zend_arena.h"
 #include "zend_API.h"
 #include "zend_constants.h"
 #include "zend_execute.h"

Zend/Optimizer/dce.c

@@ -22,6 +22,7 @@
 #include "Optimizer/zend_ssa.h"
 #include "Optimizer/zend_func_info.h"
 #include "Optimizer/zend_call_graph.h"
+#include "zend_arena.h"
 #include "zend_bitset.h"
 
 /* This pass implements a form of dead code elimination (DCE). The algorithm optimistically assumes

Zend/Optimizer/dfa_pass.c

@@ -19,6 +19,7 @@
 #include "Optimizer/zend_optimizer.h"
 #include "Optimizer/zend_optimizer_internal.h"
 #include "zend_API.h"
+#include "zend_arena.h"
 #include "zend_constants.h"
 #include "zend_execute.h"
 #include "zend_vm.h"

Zend/Optimizer/optimize_func_calls.c

@@ -23,10 +23,8 @@
 
 #include "Optimizer/zend_optimizer.h"
 #include "Optimizer/zend_optimizer_internal.h"
-#include "zend_API.h"
-#include "zend_constants.h"
-#include "zend_execute.h"
-#include "zend_vm.h"
+#include "zend_arena.h"
+#include "zend_execute.h" // for zend_vm_calc_used_stack()
 
 typedef struct _optimizer_call_info {
 	zend_function *func;

Zend/Optimizer/optimize_temp_vars_5.c

@@ -21,6 +21,7 @@
 
 #include "Optimizer/zend_optimizer.h"
 #include "Optimizer/zend_optimizer_internal.h"
+#include "zend_arena.h"
 #include "zend_API.h"
 #include "zend_constants.h"
 #include "zend_execute.h"

Zend/Optimizer/sccp.c

@@ -18,8 +18,11 @@
 */
 
 #include "zend_API.h"
+#include "zend_arena.h"
+#include "zend_multiply.h"
 #include "zend_exceptions.h"
 #include "zend_ini.h"
+#include "zend_optimizer.h"
 #include "zend_type_info.h"
 #include "Optimizer/zend_optimizer_internal.h"
 #include "Optimizer/zend_call_graph.h"

Zend/Optimizer/scdf.c

@@ -16,8 +16,9 @@
    +----------------------------------------------------------------------+
 */
 
-#include "Optimizer/zend_optimizer_internal.h"
 #include "Optimizer/scdf.h"
+#include "Optimizer/zend_optimizer_internal.h"
+#include "zend_arena.h"
 
 /* This defines a generic framework for sparse conditional dataflow propagation. The algorithm is
  * based on "Sparse conditional constant propagation" by Wegman and Zadeck. We're using a

Zend/Optimizer/scdf.h

@@ -20,6 +20,11 @@
 #define _SCDF_H
 
 #include "zend_bitset.h"
+#include "zend_long.h"
+#include "zend_ssa.h"
+
+typedef struct _zend_op_array zend_op_array;
+typedef struct _zend_optimizer_ctx zend_optimizer_ctx;
 
 typedef struct _scdf_ctx {
 	zend_op_array *op_array;

Zend/Optimizer/zend_call_graph.c

@@ -16,15 +16,11 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend_compile.h"
-#include "zend_extensions.h"
-#include "Optimizer/zend_optimizer.h"
-#include "zend_optimizer_internal.h"
-#include "zend_inference.h"
 #include "zend_call_graph.h"
+#include "zend_arena.h"
+#include "zend_bitset.h"
 #include "zend_func_info.h"
-#include "zend_inference.h"
-#include "zend_call_graph.h"
+#include "zend_optimizer_internal.h"
 
 static void zend_op_array_calc(zend_op_array *op_array, void *context)
 {

Zend/Optimizer/zend_call_graph.h

@@ -20,8 +20,9 @@
 #define ZEND_CALL_GRAPH_H
 
 #include "zend_ssa.h"
-#include "zend_func_info.h"
-#include "zend_optimizer.h"
+
+typedef struct _zend_func_info zend_func_info;
+typedef struct _zend_call_info zend_call_info;
 
 typedef struct _zend_send_arg_info {
 	zend_op                *opline;

Zend/Optimizer/zend_cfg.c

@@ -16,13 +16,12 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend_compile.h"
 #include "zend_cfg.h"
-#include "zend_func_info.h"
-#include "zend_worklist.h"
-#include "zend_optimizer.h"
+#include "zend_func_info.h" // for ZEND_FUNC_FREE_LOOP_VAR
+#include "zend_globals.h" // struct _zend_executor_globals
+#include "zend_globals_macros.h" // for EG()
 #include "zend_optimizer_internal.h"
-#include "zend_sort.h"
+#include "zend_worklist.h"
 
 static void zend_mark_reachable(zend_op *opcodes, zend_cfg *cfg, zend_basic_block *b) /* {{{ */
 {

Zend/Optimizer/zend_cfg.h

@@ -19,6 +19,13 @@
 #ifndef ZEND_CFG_H
 #define ZEND_CFG_H
 
+#include "zend_portability.h" // for BEGIN_EXTERN_C
+
+#include <stdint.h>
+
+typedef struct _zend_arena zend_arena;
+typedef struct _zend_op_array zend_op_array;
+
 /* zend_basic_block.flags */
 #define ZEND_BB_START            (1<<0)  /* first block            */
 #define ZEND_BB_FOLLOW           (1<<1)  /* follows the next block */

Zend/Optimizer/zend_func_info.c

@@ -17,17 +17,9 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend_compile.h"
-#include "zend_extensions.h"
-#include "zend_ssa.h"
-#include "zend_optimizer_internal.h"
-#include "zend_inference.h"
-#include "zend_call_graph.h"
 #include "zend_func_info.h"
-#include "zend_inference.h"
-#ifdef _WIN32
-#include "win32/ioutil.h"
-#endif
+#include "zend_extensions.h" // for zend_get_resource_handle()
+#include "zend_inference.h" // for zend_get_return_info_from_signature_only(), _ssa_op1_info()
 
 typedef uint32_t (*info_func_t)(const zend_call_info *call_info, const zend_ssa *ssa);
 

Zend/Optimizer/zend_func_info.h

@@ -19,7 +19,7 @@
 #ifndef ZEND_FUNC_INFO_H
 #define ZEND_FUNC_INFO_H
 
-#include "zend_ssa.h"
+#include "zend_call_graph.h"
 
 /* func/cfg flags */
 #define ZEND_FUNC_INDIRECT_VAR_ACCESS      (1<<0)  /* accesses variables by name  */
@@ -43,6 +43,7 @@
 
 typedef struct _zend_func_info zend_func_info;
 typedef struct _zend_call_info zend_call_info;
+typedef struct _zend_ssa zend_ssa;
 
 #define ZEND_FUNC_INFO(op_array) \
 	((zend_func_info*)((op_array)->reserved[zend_func_info_rid]))

Zend/Optimizer/zend_inference.c

@@ -16,13 +16,15 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend_compile.h"
-#include "zend_generators.h"
 #include "zend_inference.h"
+#include "zend_closures.h" // for zend_ce_closure
+#include "zend_generators.h" // for zend_ce_generator
 #include "zend_func_info.h"
+#include "zend_globals.h" // struct _zend_executor_globals
+#include "zend_globals_macros.h" // for EG()
 #include "zend_call_graph.h"
-#include "zend_closures.h"
 #include "zend_worklist.h"
+#include "zend_optimizer.h"
 #include "zend_optimizer_internal.h"
 
 /* The used range inference algorithm is described in:

Zend/Optimizer/zend_inference.h

@@ -19,12 +19,11 @@
 #ifndef ZEND_INFERENCE_H
 #define ZEND_INFERENCE_H
 
-#include "zend_optimizer.h"
+#include "zend_cfg.h" // for CRT_CONSTANT()
+#include "zend_compile.h" // for struct _zend_op
+#include "zend_portability.h" // for BEGIN_EXTERN_C
 #include "zend_ssa.h"
-#include "zend_bitset.h"
-
-/* Bitmask for type inference (zend_ssa_var_info.type) */
-#include "zend_type_info.h"
+#include "zend_type_info.h" // for MAY_BE_*
 
 #include <stdint.h>
 

Zend/Optimizer/zend_optimizer.c

@@ -21,17 +21,16 @@
 
 #include "Optimizer/zend_optimizer.h"
 #include "Optimizer/zend_optimizer_internal.h"
-#include "zend_API.h"
-#include "zend_constants.h"
-#include "zend_execute.h"
-#include "zend_vm.h"
-#include "zend_cfg.h"
-#include "zend_func_info.h"
-#include "zend_call_graph.h"
-#include "zend_inference.h"
-#include "zend_dump.h"
-#include "php.h"
+#include "php_globals.h" // for PG()
+#include "zend_API.h" // for ZVAL_EMPTY_STRING()
+#include "zend_arena.h"
+#include "zend_call_graph.h" // for struct _zend_func_info
+#include "zend_dump.h" // for zend_dump_op_array()
+#include "zend_inference.h" // for OP1_INFO(), ...
+#include "zend_ini.h"
 #include "zend_observer.h"
+#include "zend_virtual_cwd.h" //for IS_ABSOLUTE_PATH()
+#include "zend_vm.h"
 
 #ifndef ZEND_OPTIMIZER_MAX_REGISTERED_PASSES
 # define ZEND_OPTIMIZER_MAX_REGISTERED_PASSES 32

Zend/Optimizer/zend_optimizer.h

@@ -22,8 +22,11 @@
 #ifndef ZEND_OPTIMIZER_H
 #define ZEND_OPTIMIZER_H
 
-#include "zend.h"
-#include "zend_compile.h"
+#include "zend_compile.h" // for zend_op_array
+#include "zend_hash.h"
+#include "zend_portability.h" // for BEGIN_EXTERN_C
+
+typedef struct _zend_string zend_string;
 
 #define ZEND_OPTIMIZER_PASS_1		(1<<0)   /* Simple local optimizations   */
 #define ZEND_OPTIMIZER_PASS_2		(1<<1)   /*                              */

Zend/Optimizer/zend_ssa.c

@@ -17,12 +17,13 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend_compile.h"
-#include "zend_dfg.h"
 #include "zend_ssa.h"
+#include "zend_arena.h"
+#include "zend_optimizer_internal.h"
+#include "zend_dfg.h"
 #include "zend_dump.h"
-#include "zend_inference.h"
-#include "Optimizer/zend_optimizer_internal.h"
+#include "zend_inference.h" // for zend_sub_will_overflow()
+#include "zend_type_info.h" // for MAY_BE_REF
 
 static bool dominates(const zend_basic_block *blocks, int a, int b) {
 	while (blocks[b].level > blocks[a].level) {

Zend/Optimizer/zend_ssa.h

@@ -19,10 +19,15 @@
 #ifndef ZEND_SSA_H
 #define ZEND_SSA_H
 
-#include "zend_optimizer.h"
 #include "zend_cfg.h"
+#include "zend_compile.h" // for struct _zend_op
+#include "zend_long.h"
+#include "zend_portability.h" // for BEGIN_EXTERN_C
 #include "zend_result.h"
 
+typedef struct _zend_class_entry zend_class_entry;
+typedef struct _zend_script zend_script;
+
 typedef struct _zend_ssa_range {
 	zend_long              min;
 	zend_long              max;

Zend/zend.c

@@ -18,25 +18,23 @@
 */
 
 #include "zend.h"
-#include "zend_extensions.h"
-#include "zend_modules.h"
-#include "zend_constants.h"
-#include "zend_list.h"
-#include "zend_API.h"
-#include "zend_exceptions.h"
-#include "zend_builtin_functions.h"
-#include "zend_ini.h"
-#include "zend_vm.h"
-#include "zend_dtrace.h"
-#include "zend_virtual_cwd.h"
-#include "zend_smart_str.h"
-#include "zend_smart_string.h"
-#include "zend_cpuinfo.h"
-#include "zend_attributes.h"
-#include "zend_observer.h"
-#include "zend_fibers.h"
-#include "zend_call_stack.h"
-#include "Optimizer/zend_optimizer.h"
+#include "zend_attributes.h" // for zend_attributes_shutdown()
+#include "zend_builtin_functions.h" // for zend_startup_builtin_functions()
+#include "zend_cpuinfo.h" // for zend_cpu_startup()
+#include "zend_constants.h" // for ZEND_CONSTANT_DTOR
+#include "zend_errors.h" // for E_ALL, ...
+#include "zend_exceptions.h" // for zend_throw_exception_hook
+#include "zend_extensions.h" // for zend_startup_extensions_mechanism()
+#include "zend_globals.h" // for EG()
+#include "zend_ini.h" // for ZEND_INI_MH()
+#include "zend_fibers.h" // for ZEND_FIBER_DEFAULT_C_STACK_SIZE
+#include "zend_observer.h" // for zend_observer_activate()
+#include "zend_smart_str.h" // for smart_str_*()
+#include "zend_smart_string.h" // for smart_string_*()
+#include "zend_strtod.h" // for zend_startup_strtod()
+#include "zend_virtual_cwd.h" // for virtual_cwd_startup()
+#include "zend_vm.h" // for ZEND_VM_SET_OPCODE_HANDLER()
+#include "Optimizer/zend_optimizer.h" // for zend_optimizer_startup()
 
 static size_t global_map_ptr_last = 0;
 static bool startup_done = false;