Fixed JIT on first function execution (opcache.jit=1215) with CALL VM

dstogov · dstogov · commit e96b98402677 · 2021-05-12T12:24:18.000+03:00
diff --git a/ext/opcache/jit/zend_jit.c b/ext/opcache/jit/zend_jit.c
@@ -116,7 +116,7 @@ static const void *zend_jit_func_trace_counter_handler = NULL;
 static const void *zend_jit_ret_trace_counter_handler = NULL;
 static const void *zend_jit_loop_trace_counter_handler = NULL;
 
-static void ZEND_FASTCALL zend_runtime_jit(void);
+static int ZEND_FASTCALL zend_runtime_jit(void);
 
 static int zend_jit_trace_op_len(const zend_op *opline);
 static int zend_jit_trace_may_exit(const zend_op_array *op_array, const zend_op *opline);
@@ -3625,7 +3625,7 @@ static int zend_real_jit_func(zend_op_array *op_array, zend_script *script, cons
 }
 
 /* Run-time JIT handler */
-static void ZEND_FASTCALL zend_runtime_jit(void)
+static int ZEND_FASTCALL zend_runtime_jit(void)
 {
 	zend_execute_data *execute_data = EG(current_execute_data);
 	zend_op_array *op_array = &EX(func)->op_array;
@@ -3657,6 +3657,7 @@ static void ZEND_FASTCALL zend_runtime_jit(void)
 	zend_shared_alloc_unlock();
 
 	/* JIT-ed code is going to be called by VM */
+	return 0;
 }
 
 void zend_jit_check_funcs(HashTable *function_table, zend_bool is_method) {

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ static const void *zend_jit_func_trace_counter_handler = NULL;`
`116`	`116`	`static const void *zend_jit_ret_trace_counter_handler = NULL;`
`117`	`117`	`static const void *zend_jit_loop_trace_counter_handler = NULL;`
`118`	`118`
`119`		`-static void ZEND_FASTCALL zend_runtime_jit(void);`
	`119`	`+static int ZEND_FASTCALL zend_runtime_jit(void);`
`120`	`120`
`121`	`121`	`static int zend_jit_trace_op_len(const zend_op *opline);`
`122`	`122`	`static int zend_jit_trace_may_exit(const zend_op_array op_array, const zend_op opline);`
`@@ -3625,7 +3625,7 @@ static int zend_real_jit_func(zend_op_array op_array, zend_script script, cons`
`3625`	`3625`	`}`
`3626`	`3626`
`3627`	`3627`	`/* Run-time JIT handler */`
`3628`		`-static void ZEND_FASTCALL zend_runtime_jit(void)`
	`3628`	`+static int ZEND_FASTCALL zend_runtime_jit(void)`
`3629`	`3629`	`{`
`3630`	`3630`	`zend_execute_data *execute_data = EG(current_execute_data);`
`3631`	`3631`	`zend_op_array *op_array = &EX(func)->op_array;`
`@@ -3657,6 +3657,7 @@ static void ZEND_FASTCALL zend_runtime_jit(void)`
`3657`	`3657`	`zend_shared_alloc_unlock();`
`3658`	`3658`
`3659`	`3659`	`/* JIT-ed code is going to be called by VM */`
	`3660`	`+ return 0;`
`3660`	`3661`	`}`
`3661`	`3662`
`3662`	`3663`	`void zend_jit_check_funcs(HashTable *function_table, zend_bool is_method) {`