From b82242a88dba7dc36a14254ef23f6ff55a3ea940 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 20 Apr 2021 12:21:45 +0200 Subject: [PATCH] Remove unnecessary php.h includes from Zend/ The Zend/ directory really shouldn't be including php headers. These particular includes are plain unnecessary. --- Zend/Optimizer/block_pass.c | 1 - Zend/Optimizer/compact_literals.c | 1 - Zend/Optimizer/dfa_pass.c | 1 - Zend/Optimizer/escape_analysis.c | 1 - Zend/Optimizer/nop_removal.c | 1 - Zend/Optimizer/optimize_func_calls.c | 1 - Zend/Optimizer/optimize_temp_vars_5.c | 1 - Zend/Optimizer/pass3.c | 1 - Zend/Optimizer/zend_call_graph.c | 1 - Zend/Optimizer/zend_cfg.c | 2 +- Zend/Optimizer/zend_dfg.c | 1 - Zend/Optimizer/zend_dump.c | 1 - Zend/Optimizer/zend_func_info.c | 1 - Zend/Optimizer/zend_inference.c | 1 - Zend/Optimizer/zend_optimizer.c | 1 - Zend/Optimizer/zend_ssa.c | 1 - 16 files changed, 1 insertion(+), 16 deletions(-) diff --git a/Zend/Optimizer/block_pass.c b/Zend/Optimizer/block_pass.c index ec2cea53a19..00e96838880 100644 --- a/Zend/Optimizer/block_pass.c +++ b/Zend/Optimizer/block_pass.c @@ -19,7 +19,6 @@ +----------------------------------------------------------------------+ */ -#include "php.h" #include "Optimizer/zend_optimizer.h" #include "Optimizer/zend_optimizer_internal.h" #include "zend_API.h" diff --git a/Zend/Optimizer/compact_literals.c b/Zend/Optimizer/compact_literals.c index 09c63c992a1..af362d3220f 100644 --- a/Zend/Optimizer/compact_literals.c +++ b/Zend/Optimizer/compact_literals.c @@ -21,7 +21,6 @@ * - compact literals table */ -#include "php.h" #include "Optimizer/zend_optimizer.h" #include "Optimizer/zend_optimizer_internal.h" #include "zend_API.h" diff --git a/Zend/Optimizer/dfa_pass.c b/Zend/Optimizer/dfa_pass.c index 90bd2aa59a2..b6f8ed92fe1 100644 --- a/Zend/Optimizer/dfa_pass.c +++ b/Zend/Optimizer/dfa_pass.c @@ -16,7 +16,6 @@ +----------------------------------------------------------------------+ */ -#include "php.h" #include "Optimizer/zend_optimizer.h" #include "Optimizer/zend_optimizer_internal.h" #include "zend_API.h" diff --git a/Zend/Optimizer/escape_analysis.c b/Zend/Optimizer/escape_analysis.c index c0d5081c1f9..1d7db1e08db 100644 --- a/Zend/Optimizer/escape_analysis.c +++ b/Zend/Optimizer/escape_analysis.c @@ -16,7 +16,6 @@ +----------------------------------------------------------------------+ */ -#include "php.h" #include "Optimizer/zend_optimizer.h" #include "Optimizer/zend_optimizer_internal.h" #include "zend_bitset.h" diff --git a/Zend/Optimizer/nop_removal.c b/Zend/Optimizer/nop_removal.c index 32d2f10bf46..4f85abd0956 100644 --- a/Zend/Optimizer/nop_removal.c +++ b/Zend/Optimizer/nop_removal.c @@ -23,7 +23,6 @@ * - remove NOPs */ -#include "php.h" #include "Optimizer/zend_optimizer.h" #include "Optimizer/zend_optimizer_internal.h" #include "zend_API.h" diff --git a/Zend/Optimizer/optimize_func_calls.c b/Zend/Optimizer/optimize_func_calls.c index 08142c9b039..5e51aa5ea66 100644 --- a/Zend/Optimizer/optimize_func_calls.c +++ b/Zend/Optimizer/optimize_func_calls.c @@ -21,7 +21,6 @@ * - optimize INIT_FCALL_BY_NAME to DO_FCALL */ -#include "php.h" #include "Optimizer/zend_optimizer.h" #include "Optimizer/zend_optimizer_internal.h" #include "zend_API.h" diff --git a/Zend/Optimizer/optimize_temp_vars_5.c b/Zend/Optimizer/optimize_temp_vars_5.c index 6f7400159d8..9c36b2868dc 100644 --- a/Zend/Optimizer/optimize_temp_vars_5.c +++ b/Zend/Optimizer/optimize_temp_vars_5.c @@ -19,7 +19,6 @@ +----------------------------------------------------------------------+ */ -#include "php.h" #include "Optimizer/zend_optimizer.h" #include "Optimizer/zend_optimizer_internal.h" #include "zend_API.h" diff --git a/Zend/Optimizer/pass3.c b/Zend/Optimizer/pass3.c index b677c8a6a42..23997b22f9c 100644 --- a/Zend/Optimizer/pass3.c +++ b/Zend/Optimizer/pass3.c @@ -23,7 +23,6 @@ * - optimize series of JMPs */ -#include "php.h" #include "Optimizer/zend_optimizer.h" #include "Optimizer/zend_optimizer_internal.h" #include "zend_API.h" diff --git a/Zend/Optimizer/zend_call_graph.c b/Zend/Optimizer/zend_call_graph.c index fb24a8d40fe..49e8e385ed6 100644 --- a/Zend/Optimizer/zend_call_graph.c +++ b/Zend/Optimizer/zend_call_graph.c @@ -16,7 +16,6 @@ +----------------------------------------------------------------------+ */ -#include "php.h" #include "zend_compile.h" #include "zend_extensions.h" #include "Optimizer/zend_optimizer.h" diff --git a/Zend/Optimizer/zend_cfg.c b/Zend/Optimizer/zend_cfg.c index c7f574ae70a..84db409aadc 100644 --- a/Zend/Optimizer/zend_cfg.c +++ b/Zend/Optimizer/zend_cfg.c @@ -16,13 +16,13 @@ +----------------------------------------------------------------------+ */ -#include "php.h" #include "zend_compile.h" #include "zend_cfg.h" #include "zend_func_info.h" #include "zend_worklist.h" #include "zend_optimizer.h" #include "zend_optimizer_internal.h" +#include "zend_sort.h" static void zend_mark_reachable(zend_op *opcodes, zend_cfg *cfg, zend_basic_block *b) /* {{{ */ { diff --git a/Zend/Optimizer/zend_dfg.c b/Zend/Optimizer/zend_dfg.c index 66f3da3782b..cb21d5a6c4f 100644 --- a/Zend/Optimizer/zend_dfg.c +++ b/Zend/Optimizer/zend_dfg.c @@ -16,7 +16,6 @@ +----------------------------------------------------------------------+ */ -#include "php.h" #include "zend_compile.h" #include "zend_dfg.h" diff --git a/Zend/Optimizer/zend_dump.c b/Zend/Optimizer/zend_dump.c index 4a741b38c8f..763cd8e7d89 100644 --- a/Zend/Optimizer/zend_dump.c +++ b/Zend/Optimizer/zend_dump.c @@ -16,7 +16,6 @@ +----------------------------------------------------------------------+ */ -#include "php.h" #include "zend_compile.h" #include "zend_cfg.h" #include "zend_ssa.h" diff --git a/Zend/Optimizer/zend_func_info.c b/Zend/Optimizer/zend_func_info.c index 22f22f77a78..797af0e02df 100644 --- a/Zend/Optimizer/zend_func_info.c +++ b/Zend/Optimizer/zend_func_info.c @@ -17,7 +17,6 @@ +----------------------------------------------------------------------+ */ -#include "php.h" #include "zend_compile.h" #include "zend_extensions.h" #include "zend_ssa.h" diff --git a/Zend/Optimizer/zend_inference.c b/Zend/Optimizer/zend_inference.c index 2958a75a1fa..070e8f99574 100644 --- a/Zend/Optimizer/zend_inference.c +++ b/Zend/Optimizer/zend_inference.c @@ -16,7 +16,6 @@ +----------------------------------------------------------------------+ */ -#include "php.h" #include "zend_compile.h" #include "zend_generators.h" #include "zend_inference.h" diff --git a/Zend/Optimizer/zend_optimizer.c b/Zend/Optimizer/zend_optimizer.c index a93d047f2c4..6bde8d28414 100644 --- a/Zend/Optimizer/zend_optimizer.c +++ b/Zend/Optimizer/zend_optimizer.c @@ -19,7 +19,6 @@ +----------------------------------------------------------------------+ */ -#include "php.h" #include "Optimizer/zend_optimizer.h" #include "Optimizer/zend_optimizer_internal.h" #include "zend_API.h" diff --git a/Zend/Optimizer/zend_ssa.c b/Zend/Optimizer/zend_ssa.c index 8a0c91f87cc..fec5609d46e 100644 --- a/Zend/Optimizer/zend_ssa.c +++ b/Zend/Optimizer/zend_ssa.c @@ -17,7 +17,6 @@ +----------------------------------------------------------------------+ */ -#include "php.h" #include "zend_compile.h" #include "zend_dfg.h" #include "zend_ssa.h"