Fixup remaining place in zend_jit_vm_helpers.c

And add basic test for opcache_jit_blacklist.

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

Author: bwoebi

ext/opcache/jit/zend_jit_trace.c

@@ -7658,16 +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 || !(jit_extension->func_info.flags & ZEND_JIT_ON_HOT_TRACE)) {
+	if (!jit_extension || !(jit_extension->func_info.flags & ZEND_FUNC_JIT_ON_HOT_TRACE)) {
 		return;
 	}
 
 	zend_shared_alloc_lock();
 	SHM_UNPROTECT();
+	zend_jit_unprotect();
 
 	zend_jit_stop_persistent_op_array(op_array);
 	jit_extension->func_info.flags &= ~ZEND_FUNC_JIT_ON_HOT_TRACE;
 
+	zend_jit_protect();
 	SHM_PROTECT();
 	zend_shared_alloc_unlock();
 }

ext/opcache/jit/zend_jit_vm_helpers.c

@@ -524,9 +524,9 @@ 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 (UNEXPECTED(!jit_extension
-			 || !(jit_extension->func_info.flags & ZEND_FUNC_JIT_ON_HOT_TRACE)
-			 || (func->op_array.fn_flags & ZEND_ACC_FAKE_CLOSURE))) {
+            if (UNEXPECTED(!jit_extension && (func->op_array.fn_flags & ZEND_ACC_CLOSURE))
+			 || (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) {
@@ -1104,26 +1104,15 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data *ex,
 				if (func->type == ZEND_USER_FUNCTION) {
 					jit_extension =
 						(zend_jit_op_array_trace_extension*)ZEND_FUNC_INFO(&func->op_array);
+					if (UNEXPECTED(!jit_extension && (func->op_array.fn_flags & ZEND_ACC_CLOSURE))
+					 || (jit_extension && !(jit_extension->func_info.flags & ZEND_FUNC_JIT_ON_HOT_TRACE))
+					 || (func->op_array.fn_flags & ZEND_ACC_FAKE_CLOSURE)) {
+						stop = ZEND_JIT_TRACE_STOP_INTERPRETER;
+						break;
+					}
 					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))) {
-							stop = ZEND_JIT_TRACE_STOP_INTERPRETER;
-							break;
-						}
 						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) {
-						stop = ZEND_JIT_TRACE_STOP_BLACK_LIST;
-						break;
-					}
 				}
 
 #ifndef HAVE_GCC_GLOBAL_REGS

ext/opcache/tests/jit/opcache_jit_blacklist.phpt

@@ -0,0 +1,23 @@
+--TEST--
+Basic usage of opcache_jit_blacklist()
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.protect_memory=1
+opcache.jit=tracing
+--EXTENSIONS--
+opcache
+--FILE--
+<?php
+function foo() {
+    $x = 1;
+    $x += 0;
+    ++$x;
+    var_dump($x);
+}
+opcache_jit_blacklist(foo(...));
+foo();
+?>
+--EXPECT--
+int(2)

ext/opcache/zend_accelerator_module.c

@@ -928,13 +928,13 @@ 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;
+	zval *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);
+	const zend_function *func = zend_get_closure_method_def(Z_OBJ_P(closure));
 	if (ZEND_USER_CODE(func->type)) {
 		zend_jit_blacklist_function((zend_op_array *)&func->op_array);
 	}