Skip to content

Commit 6c928f3

Browse files
committed
Voidify zend_ssa_find_false_dependencies()
It always returned SUCCESS
1 parent ad3544b commit 6c928f3

File tree

4 files changed

+5
-11
lines changed

4 files changed

+5
-11
lines changed

Zend/Optimizer/dfa_pass.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,7 @@ zend_result zend_dfa_analyze_op_array(zend_op_array *op_array, zend_optimizer_ct
9393
return FAILURE;
9494
}
9595

96-
if (zend_ssa_find_false_dependencies(op_array, ssa) != SUCCESS) {
97-
return FAILURE;
98-
}
96+
zend_ssa_find_false_dependencies(op_array, ssa);
9997

10098
zend_ssa_find_sccs(op_array, ssa);
10199

Zend/Optimizer/zend_inference.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ ZEND_API void zend_ssa_find_sccs(const zend_op_array *op_array, zend_ssa *ssa) /
254254
}
255255
/* }}} */
256256

257-
ZEND_API int zend_ssa_find_false_dependencies(const zend_op_array *op_array, zend_ssa *ssa) /* {{{ */
257+
ZEND_API void zend_ssa_find_false_dependencies(const zend_op_array *op_array, zend_ssa *ssa) /* {{{ */
258258
{
259259
zend_ssa_var *ssa_vars = ssa->vars;
260260
zend_ssa_op *ssa_ops = ssa->ops;
@@ -265,7 +265,7 @@ ZEND_API int zend_ssa_find_false_dependencies(const zend_op_array *op_array, zen
265265
ALLOCA_FLAG(use_heap);
266266

267267
if (!op_array->function_name || !ssa->vars || !ssa->ops) {
268-
return SUCCESS;
268+
return;
269269
}
270270

271271
worklist = do_alloca(sizeof(zend_ulong) * zend_bitset_len(ssa_vars_count), use_heap);
@@ -306,8 +306,6 @@ ZEND_API int zend_ssa_find_false_dependencies(const zend_op_array *op_array, zen
306306
} WHILE_WORKLIST_END();
307307

308308
free_alloca(worklist, use_heap);
309-
310-
return SUCCESS;
311309
}
312310
/* }}} */
313311

Zend/Optimizer/zend_inference.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ static zend_always_inline bool zend_sub_will_overflow(zend_long a, zend_long b)
228228

229229
BEGIN_EXTERN_C()
230230

231-
ZEND_API int zend_ssa_find_false_dependencies(const zend_op_array *op_array, zend_ssa *ssa);
231+
ZEND_API void zend_ssa_find_false_dependencies(const zend_op_array *op_array, zend_ssa *ssa);
232232
ZEND_API void zend_ssa_find_sccs(const zend_op_array *op_array, zend_ssa *ssa);
233233
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);
234234

ext/opcache/jit/zend_jit.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1319,9 +1319,7 @@ static int zend_jit_op_array_analyze1(const zend_op_array *op_array, zend_script
13191319
return FAILURE;
13201320
}
13211321

1322-
if (zend_ssa_find_false_dependencies(op_array, ssa) != SUCCESS) {
1323-
return FAILURE;
1324-
}
1322+
zend_ssa_find_false_dependencies(op_array, ssa);
13251323

13261324
zend_ssa_find_sccs(op_array, ssa);
13271325
}

0 commit comments

Comments
 (0)