JIT opcode ignore list

Author: twose

Zend/zend_execute.c

@@ -4780,6 +4780,16 @@ ZEND_API user_opcode_handler_t zend_get_user_opcode_handler(zend_uchar opcode)
 	return zend_user_opcode_handlers[opcode];
 }
 
+ZEND_API bool zend_jit_opcode_ignore_list_get(zend_uchar opcode)
+{
+	return zend_jit_opcode_ignore_list[opcode];
+}
+
+ZEND_API void zend_jit_opcode_ignore_list_set(zend_uchar opcode, bool value)
+{
+	zend_jit_opcode_ignore_list[opcode] = value;
+}
+
 ZEND_API zval *zend_get_zval_ptr(const zend_op *opline, int op_type, const znode_op *node, const zend_execute_data *execute_data)
 {
 	zval *ret;

Zend/zend_execute.h

@@ -345,6 +345,9 @@ ZEND_API zval* zend_get_compiled_variable_value(const zend_execute_data *execute
 ZEND_API int zend_set_user_opcode_handler(zend_uchar opcode, user_opcode_handler_t handler);
 ZEND_API user_opcode_handler_t zend_get_user_opcode_handler(zend_uchar opcode);
 
+ZEND_API bool zend_jit_opcode_ignore_list_get(zend_uchar opcode);
+ZEND_API void zend_jit_opcode_ignore_list_set(zend_uchar opcode, bool value);
+
 ZEND_API zval *zend_get_zval_ptr(const zend_op *opline, int op_type, const znode_op *node, const zend_execute_data *execute_data);
 
 ZEND_API void zend_clean_and_cache_symbol_table(zend_array *symbol_table);

Zend/zend_vm_gen.php

@@ -2710,6 +2710,8 @@ function gen_vm($def, $skel) {
     }
     out($f, "255\n};\n\n");
 
+    out($f, "static bool zend_jit_opcode_ignore_list[256];\n\n");
+
     // Generate specialized executor
     gen_executor($f, $skl, ZEND_VM_SPEC, ZEND_VM_KIND, "execute", "zend_vm_init");
     out($f, "\n");

ext/opcache/jit/zend_jit.c

@@ -4198,7 +4198,8 @@ ZEND_EXT_API int zend_jit_check_support(void)
 	}
 
 	for (i = 0; i <= 256; i++) {
-		if (zend_get_user_opcode_handler(i) != NULL) {
+		if (zend_get_user_opcode_handler(i) != NULL &&
+			!zend_jit_opcode_ignore_list_get(i)) {
 			zend_error(E_WARNING, "JIT is incompatible with third party extensions that setup user opcode handlers. JIT disabled.");
 			JIT_G(enabled) = 0;
 			JIT_G(on) = 0;