JIT for FFI::type()

Author: dstogov

ext/opcache/jit/zend_jit_internal.h

@@ -590,6 +590,7 @@ struct _zend_jit_trace_stack_frame {
 #define TRACE_FRAME_FFI_FUNC_MEMSET           0x0000b000
 #define TRACE_FRAME_FFI_FUNC_STRING           0x0000c000
 #define TRACE_FRAME_FFI_FUNC_IS_NULL          0x0000d000
+#define TRACE_FRAME_FFI_FUNC_TYPE             0x0000e000
 
 
 #define TRACE_FRAME_INIT(frame, _func, _flags, num_args) do { \

ext/opcache/jit/zend_jit_ir_ffi.c

@@ -334,6 +334,8 @@ static int zend_jit_ffi_send_val(zend_jit_ctx         *jit,
 				SET_STACK_TYPE(stack, 2, IS_LONG, 0);
 				SET_STACK_REF_EX(stack, 2, ref, 0);
 			}
+		} else if (TRACE_FRAME_FFI_FUNC(call) == TRACE_FRAME_FFI_FUNC_TYPE) {
+			/* nothing to do */
 		} else {
 			ZEND_UNREACHABLE();
 		}
@@ -760,6 +762,11 @@ static int zend_jit_ffi_do_call(zend_jit_ctx         *jit,
 			if (res_addr) {
 				jit_set_Z_TYPE_INFO(jit, res_addr, IS_NULL);
 			}
+		} else if (TRACE_FRAME_FFI_FUNC(call) == TRACE_FRAME_FFI_FUNC_TYPE) {
+			ref = ir_CONST_ADDR(type);
+			ref = ir_CALL_1(IR_ADDR, ir_CONST_FUNC(zend_ffi_api->ctype_create), ref);
+			jit_set_Z_PTR(jit, res_addr, ref);
+			jit_set_Z_TYPE_INFO(jit, res_addr, IS_OBJECT_EX);
 		} else {
 			ZEND_UNREACHABLE();
 		}

ext/opcache/jit/zend_jit_trace.c

@@ -6943,26 +6943,57 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 						}
 #ifdef HAVE_FFI
 						if (op1_ffi_symbols) {
-							zend_ffi_symbol *sym = zend_hash_find_ptr(op1_ffi_symbols,
-								Z_STR_P(RT_CONSTANT(opline, opline->op2)));
-							if (sym
-							 && sym->kind == ZEND_FFI_SYM_FUNC
-							 && zend_jit_ffi_supported_func(ZEND_FFI_TYPE(sym->type))) {
-								ir_ref ffi_func_ref;
-
-								if (!ffi_info) {
-									ffi_info = zend_arena_calloc(&CG(arena), ssa->vars_count, sizeof(zend_jit_ffi_info));
+							zend_string *name = Z_STR_P(RT_CONSTANT(opline, opline->op2));
+
+							if (zend_string_equals_literal_ci(name, "type")) {
+								if (opline->extended_value == 1
+								 && (p+1)->op == ZEND_JIT_TRACE_INIT_CALL
+								 && (p+2)->op == ZEND_JIT_TRACE_VM
+								 && ((p+2)->opline->opcode == ZEND_SEND_VAL
+								  || (p+2)->opline->opcode == ZEND_SEND_VAL_EX)
+								 && (p+2)->opline->op1_type == IS_CONST) {
+									zval *zv = RT_CONSTANT((p+2)->opline, (p+2)->opline->op1);
+
+									if (Z_TYPE_P(zv) == IS_STRING) {
+									 	zend_ffi_dcl *dcl = zend_ffi_api->cache_type_get(Z_STR_P(zv), op1_ffi_symbols);
+
+										if (dcl) {
+											if (!ffi_info) {
+												ffi_info = zend_arena_calloc(&CG(arena), ssa->vars_count, sizeof(zend_jit_ffi_info));
+											}
+											if (!zend_jit_ffi_symbols_guard(&ctx, opline, ssa,
+													ssa_op->op1_use, -1, op1_info, op1_addr, op1_ffi_symbols, ffi_info)) {
+												goto jit_failure;
+											}
+											frame_flags = TRACE_FRAME_MASK_FFI | TRACE_FRAME_FFI_FUNC_TYPE;
+											frame_ffi_func_type = dcl->type;
+											frame_ffi_func_ref = IR_UNUSED;
+											goto done;
+										}
+									}
 								}
-								if (!zend_jit_ffi_init_call_sym(&ctx, opline, op_array, ssa, ssa_op,
-										op1_info, op1_addr,
-										sym,
-										op1_ffi_symbols, ffi_info, &ffi_func_ref)) {
-									goto jit_failure;
+							} else {
+								zend_ffi_symbol *sym = zend_hash_find_ptr(op1_ffi_symbols, name);
+
+								if (sym
+								 && sym->kind == ZEND_FFI_SYM_FUNC
+								 && zend_jit_ffi_supported_func(ZEND_FFI_TYPE(sym->type))) {
+									ir_ref ffi_func_ref;
+
+									if (!ffi_info) {
+										ffi_info = zend_arena_calloc(&CG(arena), ssa->vars_count, sizeof(zend_jit_ffi_info));
+									}
+									if (!zend_jit_ffi_init_call_sym(&ctx, opline, op_array, ssa, ssa_op,
+											op1_info, op1_addr,
+											sym,
+											op1_ffi_symbols, ffi_info, &ffi_func_ref)) {
+										goto jit_failure;
+									}
+									frame_flags = TRACE_FRAME_MASK_FFI;
+									frame_ffi_func_type = ZEND_FFI_TYPE(sym->type);
+									frame_ffi_func_ref = ffi_func_ref;
+									goto done;
 								}
-								frame_flags = TRACE_FRAME_MASK_FFI;
-								frame_ffi_func_type = ZEND_FFI_TYPE(sym->type);
-								frame_ffi_func_ref = ffi_func_ref;
-								goto done;
 							}
 						}
 #endif