From 278efe3b646f43e2ea83f43b87d35b2a9ee73578 Mon Sep 17 00:00:00 2001
From: George Peter Banyard <girgias@php.net>
Date: Mon, 20 Sep 2021 16:31:19 +0100
Subject: [PATCH] Voidify zend_build_call_graph()

It always returned SUCCESS
---
 Zend/Optimizer/zend_call_graph.c | 4 +---
 Zend/Optimizer/zend_call_graph.h | 2 +-
 Zend/Optimizer/zend_optimizer.c  | 9 +++++----
 ext/opcache/jit/zend_jit.c       | 4 +---
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Zend/Optimizer/zend_call_graph.c b/Zend/Optimizer/zend_call_graph.c
index 685b235a696..7f9a1969532 100644
--- a/Zend/Optimizer/zend_call_graph.c
+++ b/Zend/Optimizer/zend_call_graph.c
@@ -222,7 +222,7 @@ static void zend_sort_op_arrays(zend_call_graph *call_graph)
 	// TODO: perform topological sort of cyclic call graph
 }
 
-ZEND_API int zend_build_call_graph(zend_arena **arena, zend_script *script, zend_call_graph *call_graph) /* {{{ */
+ZEND_API void zend_build_call_graph(zend_arena **arena, zend_script *script, zend_call_graph *call_graph) /* {{{ */
 {
 	call_graph->op_arrays_count = 0;
 	zend_foreach_op_array(script, zend_op_array_calc, call_graph);
@@ -231,8 +231,6 @@ ZEND_API int zend_build_call_graph(zend_arena **arena, zend_script *script, zend
 	call_graph->func_infos = (zend_func_info*)zend_arena_calloc(arena, call_graph->op_arrays_count, sizeof(zend_func_info));
 	call_graph->op_arrays_count = 0;
 	zend_foreach_op_array(script, zend_op_array_collect, call_graph);
-
-	return SUCCESS;
 }
 /* }}} */
 
diff --git a/Zend/Optimizer/zend_call_graph.h b/Zend/Optimizer/zend_call_graph.h
index 0df674e685f..7023faa6d4d 100644
--- a/Zend/Optimizer/zend_call_graph.h
+++ b/Zend/Optimizer/zend_call_graph.h
@@ -60,7 +60,7 @@ typedef struct _zend_call_graph {
 
 BEGIN_EXTERN_C()
 
-ZEND_API int zend_build_call_graph(zend_arena **arena, zend_script *script, zend_call_graph *call_graph);
+ZEND_API void zend_build_call_graph(zend_arena **arena, zend_script *script, zend_call_graph *call_graph);
 ZEND_API void zend_analyze_call_graph(zend_arena **arena, zend_script *script, zend_call_graph *call_graph);
 ZEND_API zend_call_info **zend_build_call_map(zend_arena **arena, zend_func_info *info, const zend_op_array *op_array);
 ZEND_API int zend_analyze_calls(zend_arena **arena, zend_script *script, uint32_t build_flags, zend_op_array *op_array, zend_func_info *func_info);
diff --git a/Zend/Optimizer/zend_optimizer.c b/Zend/Optimizer/zend_optimizer.c
index e0bda229947..db8bc56c9d9 100644
--- a/Zend/Optimizer/zend_optimizer.c
+++ b/Zend/Optimizer/zend_optimizer.c
@@ -1431,7 +1431,6 @@ ZEND_API int zend_optimize_script(zend_script *script, zend_long optimization_le
 	zend_op_array *op_array;
 	zend_string *name;
 	zend_optimizer_ctx ctx;
-	zend_call_graph call_graph;
 
 	ctx.arena = zend_arena_create(64 * 1024);
 	ctx.script = script;
@@ -1440,9 +1439,11 @@ ZEND_API int zend_optimize_script(zend_script *script, zend_long optimization_le
 	ctx.debug_level = debug_level;
 
 	if ((ZEND_OPTIMIZER_PASS_6 & optimization_level) &&
-	    (ZEND_OPTIMIZER_PASS_7 & optimization_level) &&
-	    zend_build_call_graph(&ctx.arena, script, &call_graph) == SUCCESS) {
+	    (ZEND_OPTIMIZER_PASS_7 & optimization_level)) {
 		/* Optimize using call-graph */
+		zend_call_graph call_graph;
+		zend_build_call_graph(&ctx.arena, script, &call_graph);
+
 		int i;
 		zend_func_info *func_info;
 
@@ -1585,7 +1586,7 @@ ZEND_API int zend_optimizer_register_pass(zend_optimizer_pass_t pass)
 	}
 
 	if (zend_optimizer_registered_passes.last == ZEND_OPTIMIZER_MAX_REGISTERED_PASSES) {
-		return -1;	
+		return -1;
 	}
 
 	zend_optimizer_registered_passes.pass[
diff --git a/ext/opcache/jit/zend_jit.c b/ext/opcache/jit/zend_jit.c
index 3229a17bd30..0c96df377d7 100644
--- a/ext/opcache/jit/zend_jit.c
+++ b/ext/opcache/jit/zend_jit.c
@@ -4492,9 +4492,7 @@ ZEND_EXT_API int zend_jit_script(zend_script *script)
 	checkpoint = zend_arena_checkpoint(CG(arena));
 
 	call_graph.op_arrays_count = 0;
-	if (zend_build_call_graph(&CG(arena), script, &call_graph) != SUCCESS) {
-		goto jit_failure;
-	}
+	zend_build_call_graph(&CG(arena), script, &call_graph);
 
 	zend_analyze_call_graph(&CG(arena), script, &call_graph);