From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 24 Dec 2019 13:15:24 +0000 (+0300)
Subject: Build call graph before type inference
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e874811221c3bebb94625649d0f726d70a128265;p=php

Build call graph before type inference
---

diff --git a/ext/opcache/jit/zend_jit.c b/ext/opcache/jit/zend_jit.c
index 76f33e45ad..8b113de4bb 100644
--- a/ext/opcache/jit/zend_jit.c
+++ b/ext/opcache/jit/zend_jit.c
@@ -2924,6 +2924,7 @@ static int zend_real_jit_func(zend_op_array *op_array, zend_script *script, cons
 {
 	zend_ssa ssa;
 	void *checkpoint;
+	zend_func_info *func_info;
 
 	if (*dasm_ptr == dasm_end) {
 		return FAILURE;
@@ -2938,6 +2939,18 @@ static int zend_real_jit_func(zend_op_array *op_array, zend_script *script, cons
 		goto jit_failure;
 	}
 
+	if (zend_jit_level >= ZEND_JIT_LEVEL_OPT_FUNCS) {
+		if (zend_jit_collect_calls(op_array, script) != SUCCESS) {
+			ZEND_SET_FUNC_INFO(op_array, NULL);
+			goto jit_failure;
+		}
+		func_info = ZEND_FUNC_INFO(op_array);
+		func_info->call_map = zend_build_call_map(&CG(arena), func_info, op_array);
+		if (op_array->fn_flags & ZEND_ACC_HAS_RETURN_TYPE) {
+			zend_init_func_return_info(op_array, script, &func_info->return_info);
+		}
+	}
+
 	if (zend_jit_op_array_analyze2(op_array, script, &ssa) != SUCCESS) {
 		goto jit_failure;
 	}
@@ -2946,13 +2959,6 @@ static int zend_real_jit_func(zend_op_array *op_array, zend_script *script, cons
 		zend_dump_op_array(op_array, ZEND_DUMP_HIDE_UNREACHABLE|ZEND_DUMP_RC_INFERENCE|ZEND_DUMP_SSA, "JIT", &ssa);
 	}
 
-	if (zend_jit_level >= ZEND_JIT_LEVEL_OPT_FUNCS) {
-		if (zend_jit_collect_calls(op_array, script) != SUCCESS) {
-			ZEND_SET_FUNC_INFO(op_array, NULL);
-			goto jit_failure;
-		}
-	}
-
 	if (zend_jit(op_array, &ssa, rt_opline) != SUCCESS) {
 		goto jit_failure;
 	}