JIT for FFI::free()

Author: dstogov

ext/ffi/ffi.c

@@ -3926,22 +3926,12 @@ ZEND_METHOD(FFI, new) /* {{{ */
 }
 /* }}} */
 
-ZEND_METHOD(FFI, free) /* {{{ */
+static bool zend_ffi_cdata_free(zend_ffi_cdata *cdata) /* {{{ */
 {
-	zval *zv;
-	zend_ffi_cdata *cdata;
-
-	ZEND_FFI_VALIDATE_API_RESTRICTION();
-	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_OBJECT_OF_CLASS_EX(zv, zend_ffi_cdata_ce, 0, 1);
-	ZEND_PARSE_PARAMETERS_END();
-
-	cdata = (zend_ffi_cdata*)Z_OBJ_P(zv);
-
 	if (ZEND_FFI_TYPE(cdata->type)->kind == ZEND_FFI_TYPE_POINTER) {
 		if (!cdata->ptr) {
 			zend_throw_error(zend_ffi_exception_ce, "NULL pointer dereference");
-			RETURN_THROWS();
+			return false;
 		}
 		if (cdata->ptr != (void*)&cdata->ptr_holder) {
 			pefree(*(void**)cdata->ptr, cdata->flags & ZEND_FFI_FLAG_PERSISTENT);
@@ -3956,6 +3946,25 @@ ZEND_METHOD(FFI, free) /* {{{ */
 		cdata->std.handlers = &zend_ffi_cdata_free_handlers;
 	} else {
 		zend_throw_error(zend_ffi_exception_ce, "free() non a C pointer");
+		return false;
+	}
+	return true;
+}
+/* }}} */
+
+ZEND_METHOD(FFI, free) /* {{{ */
+{
+	zval *zv;
+	zend_ffi_cdata *cdata;
+
+	ZEND_FFI_VALIDATE_API_RESTRICTION();
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_OBJECT_OF_CLASS_EX(zv, zend_ffi_cdata_ce, 0, 1);
+	ZEND_PARSE_PARAMETERS_END();
+
+	cdata = (zend_ffi_cdata*)Z_OBJ_P(zv);
+	if (!zend_ffi_cdata_free(cdata)) {
+		RETURN_THROWS();
 	}
 }
 /* }}} */
@@ -5618,6 +5627,7 @@ ZEND_MINIT_FUNCTION(ffi)
 
 	ffi_api.cdata_create       = zend_ffi_cdata_create;
 	ffi_api.ctype_create       = zend_ffi_ctype_create;
+	ffi_api.cdata_free         = zend_ffi_cdata_free;
 	ffi_api.type_print         = zend_ffi_type_print;
 	ffi_api.is_compatible_type = zend_ffi_is_compatible_type;
 

ext/ffi/php_ffi.h

@@ -421,6 +421,7 @@ struct _zend_ffi_api {
 	/* ext/ffi interface for ext/opcache */
 	zend_ffi_cdata* (*cdata_create)(void *ptr, zend_ffi_type *type);
 	zend_ffi_ctype* (*ctype_create)(zend_ffi_type *type);
+	bool            (*cdata_free)(zend_ffi_cdata *cdata);
 	void            (*type_print)(FILE *f, const zend_ffi_type *type);
 	bool            (*is_compatible_type)(zend_ffi_type *dst_type, zend_ffi_type *src_type);
 

ext/opcache/jit/zend_jit_ir_ffi.c

@@ -137,7 +137,8 @@ static int zend_jit_ffi_send_val(zend_jit_ctx         *jit,
 	if (TRACE_FRAME_FFI_FUNC(call)) {
 		if (TRACE_FRAME_FFI_FUNC(call) == TRACE_FRAME_FFI_FUNC_ADDR
 		 || TRACE_FRAME_FFI_FUNC(call) == TRACE_FRAME_FFI_FUNC_TYPEOF
-		 || TRACE_FRAME_FFI_FUNC(call) == TRACE_FRAME_FFI_FUNC_IS_NULL) {
+		 || TRACE_FRAME_FFI_FUNC(call) == TRACE_FRAME_FFI_FUNC_IS_NULL
+		 || TRACE_FRAME_FFI_FUNC(call) == TRACE_FRAME_FFI_FUNC_FREE) {
 			ZEND_ASSERT(opline->op2.num == 1);
 			ZEND_ASSERT(op1_ffi_type);
 
@@ -667,6 +668,16 @@ static int zend_jit_ffi_do_call(zend_jit_ctx         *jit,
 			}
 			ref = ir_ADD_U32(ir_ZEXT_U32(ir_EQ(ref, IR_NULL)), ir_CONST_U32(IS_FALSE));
 			jit_set_Z_TYPE_INFO_ex(jit, res_addr, ref);
+		} else if (TRACE_FRAME_FFI_FUNC(call) == TRACE_FRAME_FFI_FUNC_FREE) {
+			ref = STACK_REF(stack, 0);
+			if (STACK_FLAGS(stack, 0) & ZREG_FFI_ZVAL_DEREF) {
+				// TODO: try to remove this dereference ???
+				ref = zend_jit_gc_deref(jit, ref);
+			}
+			ir_CALL_1(IR_VOID, ir_CONST_FUNC(zend_ffi_api->cdata_free), ref);
+			if (res_addr) {
+				jit_set_Z_TYPE_INFO(jit, res_addr, IS_NULL);
+			}
 		} else if (TRACE_FRAME_FFI_FUNC(call) == TRACE_FRAME_FFI_FUNC_STRING) {
 			ZEND_ASSERT(num_args > 0 && STACK_TYPE(stack, 0) == IS_OBJECT);
 			ref = STACK_REF(stack, 0);

ext/opcache/jit/zend_jit_trace.c

@@ -7115,6 +7115,13 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 									frame_ffi_func_type = NULL;
 									frame_ffi_func_ref = IR_UNUSED;
 									goto done;
+								} else if (Z_TYPE_P(zv) == IS_STRING
+								 && zend_string_equals_literal_ci(Z_STR_P(zv), "free")
+								 && opline->extended_value == 1) {
+									frame_flags = TRACE_FRAME_MASK_FFI | TRACE_FRAME_FFI_FUNC_FREE;
+									frame_ffi_func_type = NULL;
+									frame_ffi_func_ref = IR_UNUSED;
+									goto done;
 								}
 							}
 						}