diff --git a/Zend/Optimizer/dfa_pass.c b/Zend/Optimizer/dfa_pass.c index 299f15526fb..da9236f06c4 100644 --- a/Zend/Optimizer/dfa_pass.c +++ b/Zend/Optimizer/dfa_pass.c @@ -97,9 +97,7 @@ zend_result zend_dfa_analyze_op_array(zend_op_array *op_array, zend_optimizer_ct return FAILURE; } - if (zend_ssa_find_sccs(op_array, ssa) != SUCCESS){ - return FAILURE; - } + zend_ssa_find_sccs(op_array, ssa); if (zend_ssa_inference(&ctx->arena, op_array, ctx->script, ssa, ctx->optimization_level) != SUCCESS) { return FAILURE; diff --git a/Zend/Optimizer/zend_inference.c b/Zend/Optimizer/zend_inference.c index b321555859c..b7011dc2e68 100644 --- a/Zend/Optimizer/zend_inference.c +++ b/Zend/Optimizer/zend_inference.c @@ -210,7 +210,7 @@ static void zend_ssa_check_scc_var(const zend_op_array *op_array, zend_ssa *ssa, } /* }}} */ -ZEND_API int zend_ssa_find_sccs(const zend_op_array *op_array, zend_ssa *ssa) /* {{{ */ +ZEND_API void zend_ssa_find_sccs(const zend_op_array *op_array, zend_ssa *ssa) /* {{{ */ { int index = 0, *dfs, *root; zend_worklist_stack stack; @@ -251,8 +251,6 @@ ZEND_API int zend_ssa_find_sccs(const zend_op_array *op_array, zend_ssa *ssa) /* ZEND_WORKLIST_STACK_FREE_ALLOCA(&stack, stack_use_heap); free_alloca(root, root_use_heap); free_alloca(dfs, dfs_use_heap); - - return SUCCESS; } /* }}} */ diff --git a/Zend/Optimizer/zend_inference.h b/Zend/Optimizer/zend_inference.h index 767295ab72d..b6706629957 100644 --- a/Zend/Optimizer/zend_inference.h +++ b/Zend/Optimizer/zend_inference.h @@ -229,7 +229,7 @@ static zend_always_inline bool zend_sub_will_overflow(zend_long a, zend_long b) BEGIN_EXTERN_C() ZEND_API int zend_ssa_find_false_dependencies(const zend_op_array *op_array, zend_ssa *ssa); -ZEND_API int zend_ssa_find_sccs(const zend_op_array *op_array, zend_ssa *ssa); +ZEND_API void zend_ssa_find_sccs(const zend_op_array *op_array, zend_ssa *ssa); ZEND_API int zend_ssa_inference(zend_arena **raena, const zend_op_array *op_array, const zend_script *script, zend_ssa *ssa, zend_long optimization_level); ZEND_API uint32_t zend_array_element_type(uint32_t t1, zend_uchar op_type, int write, int insert); diff --git a/ext/opcache/jit/zend_jit.c b/ext/opcache/jit/zend_jit.c index 22d06d4e658..a0bd825b7a9 100644 --- a/ext/opcache/jit/zend_jit.c +++ b/ext/opcache/jit/zend_jit.c @@ -1323,9 +1323,7 @@ static int zend_jit_op_array_analyze1(const zend_op_array *op_array, zend_script return FAILURE; } - if (zend_ssa_find_sccs(op_array, ssa) != SUCCESS){ - return FAILURE; - } + zend_ssa_find_sccs(op_array, ssa); } return SUCCESS;