Minimal JIT support

Author: arnaud-lb

Zend/tests/partial_application/jit_001.phpt

@@ -0,0 +1,9 @@
+--TEST--
+Partial application JIT 001
+--FILE--
+<?php
+(function ($a,$b) { var_dump($a, $b); })(1, ...)(2);
+?>
+--EXPECT--
+int(1)
+int(2)

Zend/zend_partial.h

@@ -23,9 +23,8 @@
 
 BEGIN_EXTERN_C()
 
-/* This macro depends on zend_closure structure layout */
 #define ZEND_PARTIAL_OBJECT(func) \
-	((zend_object*)((char*)(func) - XtOffsetOf(struct{uint32_t a; zend_function b;}, b) - sizeof(zval) - sizeof(zend_function) - sizeof(zend_object)))
+	((zend_object*)((char*)(func) - zend_partial_func_offset()))
 
 typedef struct _zend_partial zend_partial;
 
@@ -47,6 +46,17 @@ zend_result zend_partial_init_call(zend_execute_data *call);
 
 bool zend_is_partial_function(zend_function *function);
 
+/* Offset of zend_partial.func */
+static zend_always_inline size_t zend_partial_func_offset(void) {
+	return XtOffsetOf(struct {
+		zend_object a;
+		zend_function b;
+		zval c;
+		uint32_t d;
+		zend_function func;
+	}, func);
+}
+
 END_EXTERN_C()
 
 #endif

ext/opcache/jit/zend_jit.c

@@ -298,6 +298,7 @@ static int zend_jit_needs_call_chain(zend_call_info *call_info, uint32_t b, cons
 					case ZEND_DO_FCALL_BY_NAME:
 					case ZEND_DO_FCALL:
 					case ZEND_CALLABLE_CONVERT:
+					case ZEND_CALLABLE_CONVERT_PARTIAL:
 						return 0;
 					case ZEND_SEND_VAL:
 					case ZEND_SEND_VAR:
@@ -383,6 +384,7 @@ static int zend_jit_needs_call_chain(zend_call_info *call_info, uint32_t b, cons
 				case ZEND_DO_FCALL_BY_NAME:
 				case ZEND_DO_FCALL:
 				case ZEND_CALLABLE_CONVERT:
+				case ZEND_CALLABLE_CONVERT_PARTIAL:
 					end = opline;
 					if (end - op_array->opcodes >= ssa->cfg.blocks[b].start + ssa->cfg.blocks[b].len) {
 						/* INIT_FCALL and DO_FCALL in different BasicBlocks */
@@ -862,6 +864,7 @@ static bool zend_jit_dec_call_level(uint8_t opcode)
 		case ZEND_DO_UCALL:
 		case ZEND_DO_FCALL_BY_NAME:
 		case ZEND_CALLABLE_CONVERT:
+		case ZEND_CALLABLE_CONVERT_PARTIAL:
 			return true;
 		default:
 			return false;

ext/opcache/jit/zend_jit_ir.c

@@ -16,6 +16,7 @@
  *  +----------------------------------------------------------------------+
  */
 
+#include "zend_partial.h"
 #include "jit/ir/ir.h"
 #include "jit/ir/ir_builder.h"
 

ext/opcache/jit/zend_jit_vm_helpers.c

@@ -27,6 +27,7 @@
 #include <ZendAccelerator.h>
 #include "Optimizer/zend_func_info.h"
 #include "Optimizer/zend_call_graph.h"
+#include "zend_partial.h"
 #include "zend_jit.h"
 
 #include "zend_jit_internal.h"
@@ -59,6 +60,8 @@ ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_jit_leave_nested_func_helper(ZEND_OPC
 		OBJ_RELEASE(Z_OBJ(execute_data->This));
 	} else if (UNEXPECTED(call_info & ZEND_CALL_CLOSURE)) {
 		OBJ_RELEASE(ZEND_CLOSURE_OBJECT(EX(func)));
+	} else if (UNEXPECTED(call_info & ZEND_CALL_FAKE_CLOSURE)) {
+		OBJ_RELEASE(ZEND_PARTIAL_OBJECT(EX(func)));
 	}
 	if (UNEXPECTED(call_info & ZEND_CALL_HAS_EXTRA_NAMED_PARAMS)) {
 		zend_free_extra_named_params(EX(extra_named_params));
@@ -100,6 +103,8 @@ ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_jit_leave_top_func_helper(ZEND_OPCODE
 	}
 	if (UNEXPECTED(call_info & ZEND_CALL_CLOSURE)) {
 		OBJ_RELEASE(ZEND_CLOSURE_OBJECT(EX(func)));
+	} else if (UNEXPECTED(call_info & ZEND_CALL_FAKE_CLOSURE)) {
+		OBJ_RELEASE(ZEND_PARTIAL_OBJECT(EX(func)));
 	}
 	execute_data = EG(current_execute_data);
 #ifdef HAVE_GCC_GLOBAL_REGS
@@ -692,7 +697,9 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data  *ex,
 		(zend_jit_op_array_trace_extension*)ZEND_FUNC_INFO(op_array);
 	offset = jit_extension->offset;
 	if (!op_array->function_name
-	 || (op_array->fn_flags & ZEND_ACC_CLOSURE)) {
+	 || (op_array->fn_flags & (ZEND_ACC_CLOSURE|ZEND_ACC_FAKE_CLOSURE))) {
+		/* op_array is a copy that may be freed during tracing. Also, it
+		 * may be bound to a custom scope. Fetch the original op_array. */
 		op_array = jit_extension->op_array;
 	}
 
@@ -977,7 +984,8 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data  *ex,
 				TRACE_RECORD(ZEND_JIT_TRACE_DO_ICALL, 0, func);
 			}
 		} else if (opline->opcode == ZEND_INCLUDE_OR_EVAL
-				|| opline->opcode == ZEND_CALLABLE_CONVERT) {
+				|| opline->opcode == ZEND_CALLABLE_CONVERT
+				|| opline->opcode == ZEND_CALLABLE_CONVERT_PARTIAL) {
 			/* TODO: Support tracing JIT for ZEND_CALLABLE_CONVERT. */
 			stop = ZEND_JIT_TRACE_STOP_INTERPRETER;
 			break;
@@ -1016,7 +1024,9 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data  *ex,
 			}
 			offset = jit_extension->offset;
 			if (!op_array->function_name
-			 || (op_array->fn_flags & ZEND_ACC_CLOSURE)) {
+			 || (op_array->fn_flags & (ZEND_ACC_CLOSURE|ZEND_ACC_FAKE_CLOSURE))) {
+				/* op_array is a copy that may be freed during tracing. Also, it
+				 * may be bound to a custom scope. Fetch the original op_array. */
 				op_array = jit_extension->op_array;
 			}