Zend/Optimizer/zend_func_info: include cleanup

Author: MaxKellermann

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]))