Record FFI::CTypes

Author: dstogov

ext/opcache/jit/zend_jit_ir_ffi.c

@@ -165,8 +165,8 @@ static int zend_jit_ffi_send_val(zend_jit_ctx         *jit,
 			if (op1_info & MAY_BE_REF) {
 				arg_flags |= ZREG_FFI_ZVAL_DEREF;
 			}
-			ZEND_ASSERT(op1_ffi_type || op1_ce == zend_ffi_api->ctype_ce);
-			if (!op1_ffi_type && op1_ce == zend_ffi_api->ctype_ce) {
+			ZEND_ASSERT(op1_ffi_type);
+			if (op1_ce == zend_ffi_api->ctype_ce) {
 				arg_flags |= ZREG_FFI_CTYPE;
 			}
 			ref = jit_Z_PTR(jit, op1_addr);

ext/opcache/jit/zend_jit_vm_helpers.c

@@ -559,6 +559,29 @@ static int zend_jit_trace_subtrace(zend_jit_trace_rec *trace_buffer, int start,
 	return idx + (end - start);
 }
 
+#ifdef HAVE_FFI
+static zend_ffi_type* zend_jit_trace_ffi_persistent_type(zend_ffi_type *ffi_type)
+{
+	if (!ZEND_FFI_TYPE_IS_OWNED(ffi_type)) {
+		if (ffi_type->attr & ZEND_FFI_ATTR_PERSISTENT) {
+			return ffi_type;
+		}
+	} else {
+		ffi_type = ZEND_FFI_TYPE(ffi_type);
+		if (ffi_type->kind == ZEND_FFI_TYPE_POINTER) {
+			ffi_type = ffi_type->pointer.type;
+			if (!ZEND_FFI_TYPE_IS_OWNED(ffi_type)) {
+				if (ffi_type->attr & ZEND_FFI_ATTR_PERSISTENT) {
+					/* OWNED flag means POINTER TO */
+					return ZEND_FFI_TYPE_MAKE_OWNED(ffi_type);
+				}
+			}
+		}
+	}
+	return NULL;
+}
+#endif
+
 /*
  *  Trace Linking Rules
  *  ===================
@@ -719,22 +742,11 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data  *ex,
 				if (zend_ffi_api && ce1 == zend_ffi_api->cdata_ce) {
 					zend_ffi_cdata *cdata = (zend_ffi_cdata*)Z_OBJ_P(zv);
 					zend_ffi_type *ffi_type = cdata->type;
-					if (!ZEND_FFI_TYPE_IS_OWNED(ffi_type)) {
-						if (ffi_type->attr & ZEND_FFI_ATTR_PERSISTENT) {
-							op1_ffi_type = ffi_type;
-						}
-					} else {
-						ffi_type = ZEND_FFI_TYPE(ffi_type);
-						if (ffi_type->kind == ZEND_FFI_TYPE_POINTER) {
-							ffi_type = ffi_type->pointer.type;
-							if (!ZEND_FFI_TYPE_IS_OWNED(ffi_type)) {
-								if (ffi_type->attr & ZEND_FFI_ATTR_PERSISTENT) {
-									/* OWNED flag means POINTER TO */
-									op1_ffi_type = ZEND_FFI_TYPE_MAKE_OWNED(ffi_type);
-								}
-							}
-						}
-					}
+					op1_ffi_type = zend_jit_trace_ffi_persistent_type(ffi_type);
+				} else if (zend_ffi_api && ce1 == zend_ffi_api->ctype_ce) {
+					zend_ffi_ctype *ctype = (zend_ffi_ctype*)Z_OBJ_P(zv);
+					zend_ffi_type *ffi_type = ctype->type;
+					op1_ffi_type = zend_jit_trace_ffi_persistent_type(ffi_type);
 				} else if (zend_ffi_api && ce1 == zend_ffi_api->scope_ce) {
 					zend_ffi *ffi = (zend_ffi*)Z_OBJ_P(zv);
 					if (ffi->persistent && ffi->symbols) {
@@ -795,22 +807,11 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data  *ex,
 				if (zend_ffi_api && ce2 == zend_ffi_api->cdata_ce) {
 					zend_ffi_cdata *cdata = (zend_ffi_cdata*)Z_OBJ_P(zv);
 					zend_ffi_type *ffi_type = cdata->type;
-					if (!ZEND_FFI_TYPE_IS_OWNED(ffi_type)) {
-						if (ffi_type->attr & ZEND_FFI_ATTR_PERSISTENT) {
-							op2_ffi_type = ffi_type;
-						}
-					} else {
-						ffi_type = ZEND_FFI_TYPE(ffi_type);
-						if (ffi_type->kind == ZEND_FFI_TYPE_POINTER) {
-							ffi_type = ffi_type->pointer.type;
-							if (!ZEND_FFI_TYPE_IS_OWNED(ffi_type)) {
-								if (ffi_type->attr & ZEND_FFI_ATTR_PERSISTENT) {
-									/* OWNED flag means POINTER TO */
-									op2_ffi_type = ZEND_FFI_TYPE_MAKE_OWNED(ffi_type);
-								}
-							}
-						}
-					}
+					op2_ffi_type = zend_jit_trace_ffi_persistent_type(ffi_type);
+				} else if (zend_ffi_api && ce2 == zend_ffi_api->ctype_ce) {
+					zend_ffi_ctype *ctype = (zend_ffi_ctype*)Z_OBJ_P(zv);
+					zend_ffi_type *ffi_type = ctype->type;
+					op2_ffi_type = zend_jit_trace_ffi_persistent_type(ffi_type);
 				}
 #endif
 			}
@@ -845,22 +846,11 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data  *ex,
 					if (zend_ffi_api && ce3 == zend_ffi_api->cdata_ce) {
 						zend_ffi_cdata *cdata = (zend_ffi_cdata*)Z_OBJ_P(zv);
 						zend_ffi_type *ffi_type = cdata->type;
-						if (!ZEND_FFI_TYPE_IS_OWNED(ffi_type)) {
-							if (ffi_type->attr & ZEND_FFI_ATTR_PERSISTENT) {
-								op3_ffi_type = ffi_type;
-							}
-						} else {
-							ffi_type = ZEND_FFI_TYPE(ffi_type);
-							if (ffi_type->kind == ZEND_FFI_TYPE_POINTER) {
-								ffi_type = ffi_type->pointer.type;
-								if (!ZEND_FFI_TYPE_IS_OWNED(ffi_type)) {
-									if (ffi_type->attr & ZEND_FFI_ATTR_PERSISTENT) {
-										/* OWNED flag means POINTER TO */
-										op3_ffi_type = ZEND_FFI_TYPE_MAKE_OWNED(ffi_type);
-									}
-								}
-							}
-						}
+						op3_ffi_type = zend_jit_trace_ffi_persistent_type(ffi_type);
+					} else if (zend_ffi_api && ce3 == zend_ffi_api->ctype_ce) {
+						zend_ffi_ctype *ctype = (zend_ffi_ctype*)Z_OBJ_P(zv);
+						zend_ffi_type *ffi_type = ctype->type;
+						op3_ffi_type = zend_jit_trace_ffi_persistent_type(ffi_type);
 					}
 #endif
 				}