Fixup remaining place in zend_jit_vm_helpers.c

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

Author: bwoebi

ext/opcache/jit/zend_jit_trace.c

@@ -7664,10 +7664,12 @@ ZEND_EXT_API void zend_jit_blacklist_function(zend_op_array *op_array) {
 
 	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