Use ZEND_FUNC_JIT_ON_HOT_TRACE flag

Signed-off-by: Bob Weinand <[email protected]>

Author: bwoebi

ext/opcache/jit/zend_jit_trace.c

@@ -7658,21 +7658,18 @@ static void zend_jit_blacklist_root_trace(const zend_op *opline, size_t offset)
 
 ZEND_EXT_API void zend_jit_blacklist_function(zend_op_array *op_array) {
 	zend_jit_op_array_trace_extension *jit_extension = (zend_jit_op_array_trace_extension *)ZEND_FUNC_INFO(op_array);
-	if (!jit_extension) {
+	if (!jit_extension || !(jit_extension->func_info.flags & ZEND_JIT_ON_HOT_TRACE)) {
 		return;
 	}
 
-	zend_jit_stop_persistent_op_array(op_array);
+	zend_shared_alloc_lock();
+	SHM_UNPROTECT();
 
-	// First not-skipped op
-	zend_op *opline = op_array->opcodes;
-	if (!(op_array->fn_flags & ZEND_ACC_HAS_TYPE_HINTS)) {
-		while (opline->opcode == ZEND_RECV || opline->opcode == ZEND_RECV_INIT) {
-			opline++;
-		}
-	}
+	zend_jit_stop_persistent_op_array(op_array);
+	jit_extension->func_info.flags &= ~ZEND_FUNC_JIT_ON_HOT_TRACE;
 
-	zend_jit_blacklist_root_trace(opline, jit_extension->offset);
+	SHM_PROTECT();
+	zend_shared_alloc_unlock();
 }
 
 static bool zend_jit_trace_is_bad_root(const zend_op *opline, zend_jit_trace_stop stop, size_t offset)

ext/opcache/jit/zend_jit_vm_helpers.c

@@ -515,24 +515,14 @@ static int zend_jit_trace_record_fake_init_call_ex(zend_execute_data *call, zend
 		if (func->type == ZEND_USER_FUNCTION) {
 			jit_extension =
 				(zend_jit_op_array_trace_extension*)ZEND_FUNC_INFO(&func->op_array);
-            if (func->op_array.fn_flags & ZEND_ACC_CLOSURE) {
-				if (UNEXPECTED(!jit_extension
-				 || !(jit_extension->func_info.flags & ZEND_FUNC_JIT_ON_HOT_TRACE)
-				 || (func->op_array.fn_flags & ZEND_ACC_FAKE_CLOSURE))) {
-					return -1;
-				}
-				func = (zend_function*)jit_extension->op_array;
-			}
-			// First not-skipped op
-			zend_op *opline = func->op_array.opcodes;
-			if (!(func->op_array.fn_flags & ZEND_ACC_HAS_TYPE_HINTS)) {
-				while (opline->opcode == ZEND_RECV || opline->opcode == ZEND_RECV_INIT) {
-					opline++;
-				}
-			}
-			if (jit_extension && ZEND_OP_TRACE_INFO(opline, jit_extension->offset)->trace_flags & ZEND_JIT_TRACE_BLACKLISTED) {
+			if (UNEXPECTED(!jit_extension
+			 || !(jit_extension->func_info.flags & ZEND_FUNC_JIT_ON_HOT_TRACE)
+			 || (func->op_array.fn_flags & ZEND_ACC_FAKE_CLOSURE))) {
 				return -1;
 			}
+			if (func->op_array.fn_flags & ZEND_ACC_CLOSURE) {
+				func = (zend_function*)jit_extension->op_array;
+			}
 		}
 		if (is_megamorphic == ZEND_JIT_EXIT_POLYMORPHISM
 		 /* TODO: use more accurate check ??? */
@@ -988,11 +978,6 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data *ex,
 					break;
 				}
 
-				if (jit_extension && ZEND_OP_TRACE_INFO(opline, offset)->trace_flags & ZEND_JIT_TRACE_BLACKLISTED) {
-					stop = ZEND_JIT_TRACE_STOP_BLACK_LIST;
-					break;
-				}
-
 				TRACE_RECORD(ZEND_JIT_TRACE_ENTER,
 					EX(return_value) != NULL ? ZEND_JIT_TRACE_RETURN_VALUE_USED : 0,
 					op_array);

ext/opcache/opcache.stub.php

@@ -14,6 +14,8 @@ function opcache_compile_file(string $filename): bool {}
 
 function opcache_invalidate(string $filename, bool $force = false): bool {}
 
+function opcache_jit_blacklist(Closure $closure): void {}
+
 /**
  * @return array<string, mixed>|false
  * @refcount 1

ext/opcache/opcache_arginfo.h

@@ -24,6 +24,7 @@
 #include "php.h"
 #include "ZendAccelerator.h"
 #include "zend_API.h"
+#include "zend_closures.h"
 #include "zend_shared_alloc.h"
 #include "zend_accelerator_blacklist.h"
 #include "php_ini.h"
@@ -924,6 +925,21 @@ ZEND_FUNCTION(opcache_invalidate)
 	}
 }
 
+/* {{{ Prevents JIT on function. Call it before the first invocation of the given function. */
+ZEND_FUNCTION(opcache_jit_blacklist)
+{
+	zend_object *closure;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &closure, zend_ce_closure) == FAILURE) {
+		RETURN_THROWS();
+	}
+
+	const zend_function *func = zend_get_closure_method_def(closure);
+	if (ZEND_USER_CODE(func->type)) {
+		zend_jit_blacklist_function((zend_op_array *)&func->op_array);
+	}
+}
+
 ZEND_FUNCTION(opcache_compile_file)
 {
 	zend_string *script_name;