Allow JIT for reading FFI arrays/structs/pointers

Author: dstogov

ext/opcache/jit/zend_jit_helpers.c

@@ -3304,4 +3304,27 @@ static void ZEND_FASTCALL zend_jit_zval_ffi_ptr(zval *zv, zend_ffi_type *type, v
 		ZVAL_NULL(zv);
 	}
 }
+
+static void ZEND_FASTCALL zend_jit_zval_ffi_obj(zval *zv, zend_ffi_type *type, void *ptr)
+{
+	if (!ptr) {
+		ZEND_ASSERT(type->kind == ZEND_FFI_TYPE_POINTER);
+		ZVAL_NULL(zv);
+	} else {
+		zend_ffi_cdata *cdata = emalloc(sizeof(zend_ffi_cdata));
+
+		// inlined zend_ffi_object_init()
+		GC_SET_REFCOUNT(&cdata->std, 1);
+		GC_TYPE_INFO(&cdata->std) = GC_OBJECT | (IS_OBJ_DESTRUCTOR_CALLED << GC_FLAGS_SHIFT);
+		cdata->std.ce = zend_ffi_cdata_ce;
+		cdata->std.handlers = zend_ffi_cdata_ce->default_object_handlers; /* zend_ffi_cdata_handlers */
+		cdata->std.properties = NULL;
+		zend_objects_store_put(&cdata->std);
+		cdata->type = type;
+		cdata->flags = 0;
+		cdata->ptr = ptr;
+		cdata->ptr_holder = NULL;
+		ZVAL_OBJ(zv, &cdata->std);
+	}
+}
 #endif

ext/opcache/jit/zend_jit_ir.c

@@ -3082,6 +3082,7 @@ static void zend_jit_setup_disasm(void)
 #ifdef HAVE_FFI
 	REGISTER_HELPER(zend_jit_zval_string);
 	REGISTER_HELPER(zend_jit_zval_ffi_ptr);
+	REGISTER_HELPER(zend_jit_zval_ffi_obj);
 #endif
 
 #ifndef ZTS
@@ -12960,6 +12961,23 @@ static int zend_jit_ffi_read(zend_jit_ctx       *jit,
 					ir_MUL_L(ir_ZEXT_L(ir_LOAD_U8(ptr)), ir_CONST_LONG(sizeof(void*))))));
 			res_type = IS_STRING;
 			break;
+		case ZEND_FFI_TYPE_ARRAY:
+		case ZEND_FFI_TYPE_STRUCT:
+			ir_CALL_3(IR_VOID, ir_CONST_FC_FUNC(zend_jit_zval_ffi_obj),
+				jit_ZVAL_ADDR(jit, res_addr), ir_CONST_ADDR(ffi_type), ptr);
+			return 1;
+		case ZEND_FFI_TYPE_POINTER:
+			 if ((ffi_type->attr & ZEND_FFI_ATTR_CONST)
+			  && ZEND_FFI_TYPE(ffi_type->pointer.type)->kind == ZEND_FFI_TYPE_CHAR) {
+				ir_CALL_2(IR_VOID, ir_CONST_FC_FUNC(zend_jit_zval_string), jit_ZVAL_ADDR(jit, res_addr), ptr);
+				return 1;
+			 } else {
+				ir_CALL_3(IR_VOID, ir_CONST_FC_FUNC(zend_jit_zval_ffi_ptr),
+					jit_ZVAL_ADDR(jit, res_addr), ir_CONST_ADDR(ffi_type), ir_LOAD_A(ptr));
+				return 1;
+			 }
+			 break;
+			break;
 		default:
 			ZEND_UNREACHABLE();
 	}

ext/opcache/jit/zend_jit_trace.c

@@ -5986,7 +5986,6 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 						if (op1_ffi_type
 						 && (op1_ffi_type->kind == ZEND_FFI_TYPE_ARRAY || op1_ffi_type->kind == ZEND_FFI_TYPE_POINTER)
 						 && op2_info == MAY_BE_LONG
-						 && ZEND_FFI_TYPE(op1_ffi_type->array.type)->kind < ZEND_FFI_TYPE_POINTER
 						 && ZEND_FFI_TYPE(op1_ffi_type->array.type)->kind != ZEND_FFI_TYPE_VOID
 						 && zend_jit_ffi_supported_type(ZEND_FFI_TYPE(op1_ffi_type->array.type))) {
 							if (!ffi_info) {
@@ -6244,7 +6243,6 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 
 							if (field
 							 && !field->bits
-							 && ZEND_FFI_TYPE(field->type)->kind < ZEND_FFI_TYPE_POINTER
 							 && ZEND_FFI_TYPE(field->type)->kind != ZEND_FFI_TYPE_VOID
 							 && zend_jit_ffi_supported_type(ZEND_FFI_TYPE(field->type))) {
 								if (!ffi_info) {
@@ -6266,7 +6264,6 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 								Z_STR_P(RT_CONSTANT(opline, opline->op2)));
 							if (sym
 							 && sym->kind == ZEND_FFI_SYM_VAR
-							 && ZEND_FFI_TYPE(sym->type)->kind < ZEND_FFI_TYPE_POINTER
 							 && ZEND_FFI_TYPE(sym->type)->kind != ZEND_FFI_TYPE_VOID
 							 && zend_jit_ffi_supported_type(ZEND_FFI_TYPE(sym->type))) {
 								if (!ffi_info) {