Skip to content

Commit a06d6c3

Browse files
committedSep 21, 2021
Voidify zend_cfg_identify_loops()
It always returned SUCCESS
1 parent 53c72bd commit a06d6c3

File tree

4 files changed

+4
-10
lines changed

4 files changed

+4
-10
lines changed
 

‎Zend/Optimizer/dfa_pass.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,7 @@ zend_result zend_dfa_analyze_op_array(zend_op_array *op_array, zend_optimizer_ct
6767
zend_cfg_compute_dominators_tree(op_array, &ssa->cfg);
6868

6969
/* Identify reducible and irreducible loops */
70-
if (zend_cfg_identify_loops(op_array, &ssa->cfg) != SUCCESS) {
71-
return FAILURE;
72-
}
70+
zend_cfg_identify_loops(op_array, &ssa->cfg);
7371

7472
if (ctx->debug_level & ZEND_DUMP_DFA_DOMINATORS) {
7573
zend_dump_dominators(op_array, &ssa->cfg);

‎Zend/Optimizer/zend_cfg.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -793,7 +793,7 @@ static void swap_blocks(block_info *a, block_info *b) {
793793
*b = tmp;
794794
}
795795

796-
ZEND_API int zend_cfg_identify_loops(const zend_op_array *op_array, zend_cfg *cfg) /* {{{ */
796+
ZEND_API void zend_cfg_identify_loops(const zend_op_array *op_array, zend_cfg *cfg) /* {{{ */
797797
{
798798
int i, j, k, n;
799799
int time;
@@ -905,7 +905,5 @@ ZEND_API int zend_cfg_identify_loops(const zend_op_array *op_array, zend_cfg *cf
905905
ZEND_WORKLIST_FREE_ALLOCA(&work, list_use_heap);
906906

907907
cfg->flags |= flag;
908-
909-
return SUCCESS;
910908
}
911909
/* }}} */

‎Zend/Optimizer/zend_cfg.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ ZEND_API void zend_build_cfg(zend_arena **arena, const zend_op_array *op_array,
120120
void zend_cfg_remark_reachable_blocks(const zend_op_array *op_array, zend_cfg *cfg);
121121
ZEND_API void zend_cfg_build_predecessors(zend_arena **arena, zend_cfg *cfg);
122122
ZEND_API void zend_cfg_compute_dominators_tree(const zend_op_array *op_array, zend_cfg *cfg);
123-
ZEND_API int zend_cfg_identify_loops(const zend_op_array *op_array, zend_cfg *cfg);
123+
ZEND_API void zend_cfg_identify_loops(const zend_op_array *op_array, zend_cfg *cfg);
124124

125125
END_EXTERN_C()
126126

‎ext/opcache/jit/zend_jit.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -1283,9 +1283,7 @@ static int zend_jit_build_cfg(const zend_op_array *op_array, zend_cfg *cfg)
12831283
zend_cfg_compute_dominators_tree(op_array, cfg);
12841284

12851285
/* Identify reducible and irreducible loops */
1286-
if (zend_cfg_identify_loops(op_array, cfg) != SUCCESS) {
1287-
return FAILURE;
1288-
}
1286+
zend_cfg_identify_loops(op_array, cfg);
12891287

12901288
return SUCCESS;
12911289
}

0 commit comments

Comments
 (0)