diff --git a/Zend/Optimizer/dfa_pass.c b/Zend/Optimizer/dfa_pass.c index 90e89d9818f..48bc8232cba 100644 --- a/Zend/Optimizer/dfa_pass.c +++ b/Zend/Optimizer/dfa_pass.c @@ -89,9 +89,7 @@ zend_result zend_dfa_analyze_op_array(zend_op_array *op_array, zend_optimizer_ct } - if (zend_ssa_compute_use_def_chains(&ctx->arena, op_array, ssa) != SUCCESS){ - return FAILURE; - } + zend_ssa_compute_use_def_chains(&ctx->arena, op_array, ssa); zend_ssa_find_false_dependencies(op_array, ssa); diff --git a/Zend/Optimizer/zend_ssa.c b/Zend/Optimizer/zend_ssa.c index faa61c31ea9..c5b7d29f116 100644 --- a/Zend/Optimizer/zend_ssa.c +++ b/Zend/Optimizer/zend_ssa.c @@ -1043,7 +1043,7 @@ ZEND_API zend_result zend_build_ssa(zend_arena **arena, const zend_script *scrip } /* }}} */ -ZEND_API int zend_ssa_compute_use_def_chains(zend_arena **arena, const zend_op_array *op_array, zend_ssa *ssa) /* {{{ */ +ZEND_API void zend_ssa_compute_use_def_chains(zend_arena **arena, const zend_op_array *op_array, zend_ssa *ssa) /* {{{ */ { zend_ssa_var *ssa_vars; int i; @@ -1158,8 +1158,6 @@ ZEND_API int zend_ssa_compute_use_def_chains(zend_arena **arena, const zend_op_a ssa_vars[i].alias = ssa_vars[ssa_vars[i].var].alias; } } - - return SUCCESS; } /* }}} */ diff --git a/Zend/Optimizer/zend_ssa.h b/Zend/Optimizer/zend_ssa.h index 88c4a9c671e..da75595abfa 100644 --- a/Zend/Optimizer/zend_ssa.h +++ b/Zend/Optimizer/zend_ssa.h @@ -146,7 +146,7 @@ typedef struct _zend_ssa { BEGIN_EXTERN_C() ZEND_API zend_result zend_build_ssa(zend_arena **arena, const zend_script *script, const zend_op_array *op_array, uint32_t build_flags, zend_ssa *ssa); -ZEND_API int zend_ssa_compute_use_def_chains(zend_arena **arena, const zend_op_array *op_array, zend_ssa *ssa); +ZEND_API void zend_ssa_compute_use_def_chains(zend_arena **arena, const zend_op_array *op_array, zend_ssa *ssa); ZEND_API int zend_ssa_rename_op(const zend_op_array *op_array, const zend_op *opline, uint32_t k, uint32_t build_flags, int ssa_vars_count, zend_ssa_op *ssa_ops, int *var); int zend_ssa_unlink_use_chain(zend_ssa *ssa, int op, int var); diff --git a/ext/opcache/jit/zend_jit.c b/ext/opcache/jit/zend_jit.c index 210cf2323a2..f7926c9fb04 100644 --- a/ext/opcache/jit/zend_jit.c +++ b/ext/opcache/jit/zend_jit.c @@ -1315,9 +1315,7 @@ static int zend_jit_op_array_analyze1(const zend_op_array *op_array, zend_script return FAILURE; } - if (zend_ssa_compute_use_def_chains(&CG(arena), op_array, ssa) != SUCCESS) { - return FAILURE; - } + zend_ssa_compute_use_def_chains(&CG(arena), op_array, ssa); zend_ssa_find_false_dependencies(op_array, ssa);