Voidify zend_build_cfg()

It always returned SUCCESS

Author: Girgias

Zend/Optimizer/block_pass.c

@@ -1847,10 +1847,7 @@ void zend_optimize_cfg(zend_op_array *op_array, zend_optimizer_ctx *ctx)
 
     /* Build CFG */
 	checkpoint = zend_arena_checkpoint(ctx->arena);
-	if (zend_build_cfg(&ctx->arena, op_array, 0, &cfg) != SUCCESS) {
-		zend_arena_release(&ctx->arena, checkpoint);
-		return;
-	}
+	zend_build_cfg(&ctx->arena, op_array, 0, &cfg);
 
 	if (cfg.blocks_count * (op_array->last_var + op_array->T) > 64 * 1024 * 1024) {
 		zend_arena_release(&ctx->arena, checkpoint);

Zend/Optimizer/dfa_pass.c

@@ -50,9 +50,7 @@ zend_result zend_dfa_analyze_op_array(zend_op_array *op_array, zend_optimizer_ct
     /* Build SSA */
 	memset(ssa, 0, sizeof(zend_ssa));
 
-	if (zend_build_cfg(&ctx->arena, op_array, ZEND_CFG_NO_ENTRY_PREDECESSORS, &ssa->cfg) != SUCCESS) {
-		return FAILURE;
-	}
+	zend_build_cfg(&ctx->arena, op_array, ZEND_CFG_NO_ENTRY_PREDECESSORS, &ssa->cfg);
 
 	if ((ssa->cfg.flags & ZEND_FUNC_INDIRECT_VAR_ACCESS)) {
 		/* TODO: we can't analyze functions with indirect variable access ??? */

Zend/Optimizer/zend_cfg.c

@@ -269,7 +269,7 @@ static void initialize_block(zend_basic_block *block) {
 		block_map[i]++; \
 	} while (0)
 
-ZEND_API int zend_build_cfg(zend_arena **arena, const zend_op_array *op_array, uint32_t build_flags, zend_cfg *cfg) /* {{{ */
+ZEND_API void zend_build_cfg(zend_arena **arena, const zend_op_array *op_array, uint32_t build_flags, zend_cfg *cfg) /* {{{ */
 {
 	uint32_t flags = 0;
 	uint32_t i;
@@ -597,8 +597,6 @@ ZEND_API int zend_build_cfg(zend_arena **arena, const zend_op_array *op_array, u
 	/* Build CFG, Step 4, Mark Reachable Basic Blocks */
 	cfg->flags |= flags;
 	zend_mark_reachable_blocks(op_array, cfg, 0);
-
-	return SUCCESS;
 }
 /* }}} */
 

Zend/Optimizer/zend_cfg.h

@@ -116,7 +116,7 @@ typedef struct _zend_cfg {
 
 BEGIN_EXTERN_C()
 
-ZEND_API int zend_build_cfg(zend_arena **arena, const zend_op_array *op_array, uint32_t build_flags, zend_cfg *cfg);
+ZEND_API void zend_build_cfg(zend_arena **arena, const zend_op_array *op_array, uint32_t build_flags, zend_cfg *cfg);
 void zend_cfg_remark_reachable_blocks(const zend_op_array *op_array, zend_cfg *cfg);
 ZEND_API int zend_cfg_build_predecessors(zend_arena **arena, zend_cfg *cfg);
 ZEND_API int zend_cfg_compute_dominators_tree(const zend_op_array *op_array, zend_cfg *cfg);

ext/opcache/jit/zend_jit.c

@@ -1268,9 +1268,7 @@ static int zend_jit_build_cfg(const zend_op_array *op_array, zend_cfg *cfg)
 
 	flags = ZEND_CFG_STACKLESS | ZEND_CFG_NO_ENTRY_PREDECESSORS | ZEND_SSA_RC_INFERENCE_FLAG | ZEND_SSA_USE_CV_RESULTS | ZEND_CFG_RECV_ENTRY;
 
-	if (zend_build_cfg(&CG(arena), op_array, flags, cfg) != SUCCESS) {
-		return FAILURE;
-	}
+	zend_build_cfg(&CG(arena), op_array, flags, cfg);
 
 	/* Don't JIT huge functions. Apart from likely being detrimental due to the amount of
 	 * generated code, some of our analysis is recursive and will stack overflow with many