Deduplicate dominates() function

Author: nielsdos

Zend/Optimizer/dfa_pass.c

@@ -1066,14 +1066,6 @@ static bool zend_dfa_try_to_replace_result(zend_op_array *op_array, zend_ssa *ss
 	return 0;
 }
 
-// FIXME: copied from zend_ssa.c (which is a copy from zend_cfg.c)
-static bool dominates(const zend_basic_block *blocks, int a, int b) {
-	while (blocks[b].level > blocks[a].level) {
-		b = blocks[b].idom;
-	}
-	return a == b;
-}
-
 static bool op_dominates(const zend_op_array *op_array, const zend_ssa *ssa, const zend_op *a, const zend_op *b)
 {
 	uint32_t a_block = ssa->cfg.map[a - op_array->opcodes];

Zend/Optimizer/zend_cfg.c

@@ -761,7 +761,7 @@ ZEND_API void zend_cfg_compute_dominators_tree(const zend_op_array *op_array, ze
 }
 /* }}} */
 
-static bool dominates(zend_basic_block *blocks, int a, int b) /* {{{ */
+bool dominates(const zend_basic_block *blocks, int a, int b) /* {{{ */
 {
 	while (blocks[b].level > blocks[a].level) {
 		b = blocks[b].idom;

Zend/Optimizer/zend_cfg.h

@@ -120,6 +120,7 @@ void zend_cfg_remark_reachable_blocks(const zend_op_array *op_array, zend_cfg *c
 ZEND_API void zend_cfg_build_predecessors(zend_arena **arena, zend_cfg *cfg);
 ZEND_API void zend_cfg_compute_dominators_tree(const zend_op_array *op_array, zend_cfg *cfg);
 ZEND_API void zend_cfg_identify_loops(const zend_op_array *op_array, zend_cfg *cfg);
+bool dominates(const zend_basic_block *blocks, int a, int b);
 
 END_EXTERN_C()
 

Zend/Optimizer/zend_ssa.c

@@ -18,19 +18,13 @@
 */
 
 #include "zend_compile.h"
+#include "zend_cfg.h"
 #include "zend_dfg.h"
 #include "zend_ssa.h"
 #include "zend_dump.h"
 #include "zend_inference.h"
 #include "Optimizer/zend_optimizer_internal.h"
 
-static bool dominates(const zend_basic_block *blocks, int a, int b) {
-	while (blocks[b].level > blocks[a].level) {
-		b = blocks[b].idom;
-	}
-	return a == b;
-}
-
 static bool will_rejoin(
 		const zend_cfg *cfg, const zend_dfg *dfg, const zend_basic_block *block,
 		int other_successor, int exclude, int var) {

ext/opcache/jit/zend_jit.c

@@ -156,13 +156,6 @@ static int zend_jit_assign_to_variable(dasm_State    **Dst,
                                        zend_jit_addr   res_addr,
                                        bool       check_exception);
 
-static bool dominates(const zend_basic_block *blocks, int a, int b) {
-	while (blocks[b].level > blocks[a].level) {
-		b = blocks[b].idom;
-	}
-	return a == b;
-}
-
 static bool zend_ssa_is_last_use(const zend_op_array *op_array, const zend_ssa *ssa, int var, int use)
 {
 	int next_use;