From 1a067b84ee423a6fb06a5debd92b4cafefeac4e4 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 4 Jan 2023 21:45:57 +0100 Subject: [PATCH] Zend/Optimizer/zend_optimizer: include cleanup --- Zend/Optimizer/zend_optimizer.c | 19 +++++++++---------- Zend/Optimizer/zend_optimizer.h | 7 +++++-- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Zend/Optimizer/zend_optimizer.c b/Zend/Optimizer/zend_optimizer.c index b5841159bf1..dcbb355ff99 100644 --- a/Zend/Optimizer/zend_optimizer.c +++ b/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 diff --git a/Zend/Optimizer/zend_optimizer.h b/Zend/Optimizer/zend_optimizer.h index 16bfd75520d..ae794b1ae66 100644 --- a/Zend/Optimizer/zend_optimizer.h +++ b/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) /* */