JIT/FFI better support for temporary POINTER types

Author: dstogov

ext/opcache/jit/zend_jit.c

@@ -56,6 +56,16 @@ typedef struct zend_jit_ffi_info {
 	uint32_t           info;
 } zend_jit_ffi_info;
 
+static zend_ffi_type *zend_jit_ffi_type_pointer_to(const zend_ffi_type *type, zend_ffi_type *holder)
+{
+	holder->kind = ZEND_FFI_TYPE_POINTER;
+	holder->attr = 0;
+	holder->size = sizeof(void*);
+	holder->align = _Alignof(void*);
+	holder->pointer.type = ZEND_FFI_TYPE(type);
+	return holder;
+}
+
 static bool zend_jit_ffi_supported_type(zend_ffi_type *type)
 {
 	if (sizeof(void*) == 4) {

ext/opcache/jit/zend_jit_ir.c

@@ -17365,13 +17365,18 @@ static bool zend_jit_opline_supports_reg(const zend_op_array *op_array, zend_ssa
 			 && (trace+1)->op == ZEND_JIT_TRACE_OP1_TYPE
 			 && (trace+2)->op == ZEND_JIT_TRACE_OP1_FFI_TYPE) {
 				zend_ffi_type *op1_ffi_type = (zend_ffi_type*)(trace+2)->ptr;
-				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))) {
-					return 1;
+				if (op1_ffi_type) {
+					zend_ffi_type holder;
+					if (ZEND_FFI_TYPE_IS_OWNED(op1_ffi_type)) {
+						op1_ffi_type = zend_jit_ffi_type_pointer_to(op1_ffi_type, &holder);
+					}
+					if ((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))) {
+						return 1;
+					}
 				}
 			}
 #endif
@@ -17428,17 +17433,25 @@ static bool zend_jit_opline_supports_reg(const zend_op_array *op_array, zend_ssa
 				zend_ffi_type *op1_ffi_type = (zend_ffi_type*)(trace+2)->ptr;
 				zend_ffi_type *op3_ffi_type = NULL;
 				uint32_t op1_data_info = OP1_DATA_INFO();
+				zend_ffi_type holder, holder2;
 
 				if ((trace+3)->op == ZEND_JIT_TRACE_OP3_TYPE
 				 && (trace+4)->op == ZEND_JIT_TRACE_OP3_FFI_TYPE) {
 					op3_ffi_type = (zend_ffi_type*)(trace+4)->ptr;
+					if (ZEND_FFI_TYPE_IS_OWNED(op3_ffi_type)) {
+						op3_ffi_type = zend_jit_ffi_type_pointer_to(op3_ffi_type, &holder2);
+					}
 				}
 
-				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_jit_ffi_compatible(op1_ffi_type->array.type, op1_data_info, op3_ffi_type)) {
-					return 1;
+				if (op1_ffi_type) {
+					if (ZEND_FFI_TYPE_IS_OWNED(op1_ffi_type)) {
+						op1_ffi_type = zend_jit_ffi_type_pointer_to(op1_ffi_type, &holder);
+					}
+					if ((op1_ffi_type->kind == ZEND_FFI_TYPE_ARRAY || op1_ffi_type->kind == ZEND_FFI_TYPE_POINTER)
+					 && op2_info == MAY_BE_LONG
+					 && zend_jit_ffi_compatible(op1_ffi_type->array.type, op1_data_info, op3_ffi_type)) {
+						return 1;
+					}
 				}
 			}
 #endif

ext/opcache/jit/zend_jit_ir_ffi.c

@@ -16,17 +16,6 @@
  *  +----------------------------------------------------------------------+
  */
 
-
-static zend_ffi_type *zend_jit_ffi_type_pointer_to(const zend_ffi_type *type, zend_ffi_type *holder)
-{
-	holder->kind = ZEND_FFI_TYPE_POINTER;
-	holder->attr = 0;
-	holder->size = sizeof(void*);
-	holder->align = _Alignof(void*);
-	holder->pointer.type = ZEND_FFI_TYPE(type);
-	return holder;
-}
-
 static ir_ref jit_FFI_CDATA_PTR(zend_jit_ctx *jit, ir_ref obj_ref)
 {
 	return ir_LOAD_A(ir_ADD_OFFSET(obj_ref, offsetof(zend_ffi_cdata, ptr)));
@@ -125,12 +114,6 @@ static int zend_jit_ffi_send_val(zend_jit_ctx         *jit,
 	ir_ref ref = IR_UNUSED;
 	uint8_t arg_type = IS_UNDEF;
 	uint8_t arg_flags = 0;
-	zend_ffi_type type_holder;
-
-	if (ZEND_FFI_TYPE_IS_OWNED(op1_ffi_type)) {
-		/* OWNED flag means POINTER TO */
-		op1_ffi_type = zend_jit_ffi_type_pointer_to(op1_ffi_type, &type_holder);
-	}
 
 	ZEND_ASSERT(type->kind == ZEND_FFI_TYPE_FUNC);
 	if (type->attr & ZEND_FFI_ATTR_VARIADIC) {

ext/opcache/jit/zend_jit_trace.c

@@ -4415,6 +4415,7 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 			zend_ffi_type *op1_ffi_type = NULL;
 			zend_ffi_type *op2_ffi_type = NULL;
 			zend_ffi_type *op3_ffi_type = NULL;
+			zend_ffi_type holder1, holder2, holder3;
 			HashTable *op1_ffi_symbols = NULL;
 			(void)op2_ffi_type;
 #endif
@@ -4441,6 +4442,9 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 #ifdef HAVE_FFI
 			if ((p+1)->op == ZEND_JIT_TRACE_OP1_FFI_TYPE) {
 				op1_ffi_type = (zend_ffi_type*)(p+1)->ptr;
+				if (ZEND_FFI_TYPE_IS_OWNED(op1_ffi_type)) {
+					op1_ffi_type = zend_jit_ffi_type_pointer_to(op1_ffi_type, &holder1);
+				}
 				p++;
 			} else if ((p+1)->op == ZEND_JIT_TRACE_OP1_FFI_SYMBOLS) {
 				op1_ffi_symbols = (HashTable*)(p+1)->ptr;
@@ -4454,6 +4458,9 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 #ifdef HAVE_FFI
 			if ((p+1)->op == ZEND_JIT_TRACE_OP2_FFI_TYPE) {
 				op2_ffi_type = (zend_ffi_type*)(p+1)->ptr;
+				if (ZEND_FFI_TYPE_IS_OWNED(op2_ffi_type)) {
+					op2_ffi_type = zend_jit_ffi_type_pointer_to(op2_ffi_type, &holder2);
+				}
 				p++;
 			}
 #endif
@@ -4464,6 +4471,9 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 #ifdef HAVE_FFI
 			if ((p+1)->op == ZEND_JIT_TRACE_OP3_FFI_TYPE) {
 				op3_ffi_type = (zend_ffi_type*)(p+1)->ptr;
+				if (ZEND_FFI_TYPE_IS_OWNED(op3_ffi_type)) {
+					op3_ffi_type = zend_jit_ffi_type_pointer_to(op3_ffi_type, &holder3);
+				}
 				p++;
 			}
 #endif