JIT/FFI print FFI types in JIT debug traces

Author: dstogov

Zend/zend.c

@@ -105,6 +105,7 @@ ZEND_API zend_ffi_dcl*   (*zend_ffi_cache_type_get)(zend_string *str, void *cont
 ZEND_API zend_ffi_dcl*   (*zend_ffi_cache_type_add)(zend_string *str, zend_ffi_dcl *dcl, void *context) = NULL;
 ZEND_API zend_ffi_scope* (*zend_ffi_cache_scope_get)(zend_string *str) = NULL;
 ZEND_API zend_ffi_scope* (*zend_ffi_cache_scope_add)(zend_string *str, zend_ffi_scope *scope) = NULL;
+ZEND_API void            (*zend_ffi_type_print)(FILE *f, const zend_ffi_type *type) = NULL;
 
 /* This callback must be signal handler safe! */
 void (*zend_on_timeout)(int seconds);

Zend/zend.h

@@ -421,7 +421,7 @@ ZEND_API extern zend_ffi_dcl*   (*zend_ffi_cache_type_get)(zend_string *str, voi
 ZEND_API extern zend_ffi_dcl*   (*zend_ffi_cache_type_add)(zend_string *str, zend_ffi_dcl *dcl, void *context);
 ZEND_API extern zend_ffi_scope* (*zend_ffi_cache_scope_get)(zend_string *str);
 ZEND_API extern zend_ffi_scope* (*zend_ffi_cache_scope_add)(zend_string *str, zend_ffi_scope *scope);
-
+ZEND_API extern void            (*zend_ffi_type_print)(FILE *f, const zend_ffi_type *type);
 
 /* If DTrace is available and enabled */
 extern ZEND_API bool zend_dtrace_enabled;

ext/ffi/ffi.c

@@ -5314,6 +5314,17 @@ static ZEND_INI_DISP(zend_ffi_enable_displayer_cb) /* {{{ */
 }
 /* }}} */
 
+static void _zend_ffi_type_print(FILE *f, const zend_ffi_type *type) /* {{{ */
+{
+	zend_ffi_ctype_name_buf buf;
+
+	buf.start = buf.end = buf.buf + ((MAX_TYPE_NAME_LEN * 3) / 4);
+	if (!zend_ffi_ctype_name(&buf, ZEND_FFI_TYPE(type))) {
+	} else {
+		fwrite(buf.start, buf.end - buf.start, 1, f);
+	}
+}
+
 ZEND_INI_BEGIN()
 	ZEND_INI_ENTRY_EX("ffi.enable", "preload", ZEND_INI_SYSTEM, OnUpdateFFIEnable, zend_ffi_enable_displayer_cb)
 	STD_ZEND_INI_ENTRY("ffi.preload", NULL, ZEND_INI_SYSTEM, OnUpdateString, preload, zend_ffi_globals, ffi_globals)
@@ -5597,6 +5608,7 @@ ZEND_MINIT_FUNCTION(ffi)
 	zend_ffi_ctype_handlers.get_gc               = zend_fake_get_gc;
 
 	zend_ffi_cdata_create = _zend_ffi_cdata_create;
+	zend_ffi_type_print   = _zend_ffi_type_print;
 
 	if (FFI_G(preload)) {
 		return zend_ffi_preload(FFI_G(preload));

ext/opcache/jit/zend_jit_trace.c

@@ -8335,9 +8335,11 @@ static void zend_jit_dump_trace(zend_jit_trace_rec *trace_buffer, zend_ssa *tssa
 						p++;
 #ifdef HAVE_FFI
 						if ((p+1)->op == ZEND_JIT_TRACE_OP1_FFI_TYPE) {
-							fprintf(stderr, " op1(%sobject of class %s: ffi_type)", ref,
+							fprintf(stderr, " op1(%sobject of class %s: ", ref,
 								ZSTR_VAL(p->ce->name));
 							p++;
+							zend_ffi_type_print(stderr, p->ptr);
+							fprintf(stderr, ")");
 						} else if ((p+1)->op == ZEND_JIT_TRACE_OP1_FFI_SYMBOLS) {
 							fprintf(stderr, " op1(%sobject of class %s: ffi_symbols)", ref,
 								ZSTR_VAL(p->ce->name));
@@ -8359,9 +8361,11 @@ static void zend_jit_dump_trace(zend_jit_trace_rec *trace_buffer, zend_ssa *tssa
 						p++;
 #ifdef HAVE_FFI
 						if ((p+1)->op == ZEND_JIT_TRACE_OP2_FFI_TYPE) {
-							fprintf(stderr, " op2(%sobject of class %s: ffi_type)", ref,
+							fprintf(stderr, " op2(%sobject of class %s: ", ref,
 								ZSTR_VAL(p->ce->name));
 							p++;
+							zend_ffi_type_print(stderr, p->ptr);
+							fprintf(stderr, ")");
 						} else
 #endif
 						fprintf(stderr, " op2(%sobject of class %s)", ref,
@@ -8379,9 +8383,11 @@ static void zend_jit_dump_trace(zend_jit_trace_rec *trace_buffer, zend_ssa *tssa
 						p++;
 #ifdef HAVE_FFI
 						if ((p+1)->op == ZEND_JIT_TRACE_OP3_FFI_TYPE) {
-							fprintf(stderr, " op3(%sobject of class %s: ffi_type)", ref,
+							fprintf(stderr, " op3(%sobject of class %s: ", ref,
 								ZSTR_VAL(p->ce->name));
 							p++;
+							zend_ffi_type_print(stderr, p->ptr);
+							fprintf(stderr, ")");
 						} else
 #endif
 						fprintf(stderr, " op3(%sobject of class %s)", ref,