Better JIT support for FFI function calls

Author: dstogov

ext/opcache/jit/zend_jit_ir_ffi.c

@@ -188,6 +188,7 @@ static int zend_jit_ffi_send_val(zend_jit_ctx         *jit,
 				 && op1_ffi_type->kind == ZEND_FFI_TYPE_POINTER
 				 && ZEND_FFI_TYPE(type->pointer.type) == ZEND_FFI_TYPE(op1_ffi_type->pointer.type)) {
 					ref = jit_FFI_CDATA_PTR(jit, jit_Z_PTR(jit, op1_addr));
+					ref = ir_LOAD_A(ref); // TODO: is this always necessary ???
 				} else if (op1_ffi_type
 				 && op1_ffi_type->kind == ZEND_FFI_TYPE_ARRAY
 				 && ZEND_FFI_TYPE(type->pointer.type) == ZEND_FFI_TYPE(op1_ffi_type->array.type)) {

ext/opcache/jit/zend_jit_trace.c

@@ -5533,22 +5533,25 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 						goto done;
 					case ZEND_CHECK_FUNC_ARG:
 						if (!JIT_G(current_frame)
-						 || !JIT_G(current_frame)->call
-						 || !JIT_G(current_frame)->call->func) {
-							break;
-						}
-						if (opline->op2_type == IS_CONST
-						 || opline->op2.num > MAX_ARG_FLAG_NUM) {
-							/* Named parameters not supported in JIT */
-							TRACE_FRAME_SET_LAST_SEND_UNKNOWN(JIT_G(current_frame)->call);
+						 || !JIT_G(current_frame)->call) {
 							break;
 						}
 #ifdef HAVE_FFI
 						if (TRACE_FRAME_FFI(JIT_G(current_frame)->call)) {
 							/* FFI arguments alwyas sent by value ??? */
+							TRACE_FRAME_SET_LAST_SEND_BY_VAL(JIT_G(current_frame)->call);
 							goto done;
 						}
 #endif
+						if (!JIT_G(current_frame)->call->func) {
+							break;
+						}
+						if (opline->op2_type == IS_CONST
+						 || opline->op2.num > MAX_ARG_FLAG_NUM) {
+							/* Named parameters not supported in JIT */
+							TRACE_FRAME_SET_LAST_SEND_UNKNOWN(JIT_G(current_frame)->call);
+							break;
+						}
 						if (!zend_jit_check_func_arg(&ctx, opline)) {
 							goto jit_failure;
 						}
@@ -5986,7 +5989,7 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 					case ZEND_FETCH_DIM_FUNC_ARG:
 						if (!JIT_G(current_frame)
 						 || !JIT_G(current_frame)->call
-						 || !JIT_G(current_frame)->call->func
+//???						 || !JIT_G(current_frame)->call->func
 						 || !TRACE_FRAME_IS_LAST_SEND_BY_VAL(JIT_G(current_frame)->call)) {
 							break;
 						}
@@ -6226,7 +6229,7 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 					case ZEND_FETCH_OBJ_FUNC_ARG:
 						if (!JIT_G(current_frame)
 						 || !JIT_G(current_frame)->call
-						 || !JIT_G(current_frame)->call->func
+//???						 || !JIT_G(current_frame)->call->func
 						 || !TRACE_FRAME_IS_LAST_SEND_BY_VAL(JIT_G(current_frame)->call)) {
 							break;
 						}