Review suggestion for zend_ffi_cdata_to_zval()

Author: ndossche

ext/ffi/ffi.c

@@ -195,7 +195,6 @@ typedef struct _zend_ffi {
  * > However, integral types narrower than the system register size are widened.
  * > In these cases your program may assume that ret points to an ffi_arg object.
  */
-#define ZEND_FFI_READ_NARROW(ty, ptr, is_ret) (is_ret ? ((ty) *(ffi_arg *) ptr) : (*(ty *) ptr))
 #define ZEND_FFI_WRITE_NARROW(ty, ptr, val, is_ret) do { \
 	if (is_ret) { \
 		*(ffi_arg *) ptr = (ffi_arg) (ty) val; \
@@ -562,6 +561,42 @@ static zend_always_inline void zend_ffi_cdata_to_zval(zend_ffi_cdata *cdata, voi
 	if (read_type == BP_VAR_R) {
 		zend_ffi_type_kind kind = type->kind;
 
+		/* Return values are widened to a machine register. */
+		if (is_ret) {
+			if (kind == ZEND_FFI_TYPE_ENUM) {
+				kind = type->enumeration.kind;
+			}
+
+			switch (kind) {
+				case ZEND_FFI_TYPE_UINT8:
+				case ZEND_FFI_TYPE_UINT16:
+#if SIZEOF_SIZE_T == 8
+				case ZEND_FFI_TYPE_UINT32:
+					kind = ZEND_FFI_TYPE_UINT64;
+#else
+					kind = ZEND_FFI_TYPE_UINT32;
+#endif
+					break;
+				case ZEND_FFI_TYPE_SINT8:
+				case ZEND_FFI_TYPE_SINT16:
+#if SIZEOF_SIZE_T == 8
+				case ZEND_FFI_TYPE_SINT32:
+					kind = ZEND_FFI_TYPE_SINT64;
+#else
+					kind = ZEND_FFI_TYPE_SINT32;
+#endif
+					break;
+				case ZEND_FFI_TYPE_BOOL:
+					ZVAL_BOOL(rv, *(ffi_arg*)ptr);
+					return;
+				case ZEND_FFI_TYPE_CHAR:
+					ZVAL_CHAR(rv, *(ffi_arg*)ptr);
+					return;
+				default:
+					break;
+			}
+		}
+
 again:
 	    switch (kind) {
 			case ZEND_FFI_TYPE_FLOAT:
@@ -576,22 +611,22 @@ static zend_always_inline void zend_ffi_cdata_to_zval(zend_ffi_cdata *cdata, voi
 				return;
 #endif
 			case ZEND_FFI_TYPE_UINT8:
-				ZVAL_LONG(rv, ZEND_FFI_READ_NARROW(uint8_t, ptr, is_ret));
+				ZVAL_LONG(rv, *(uint8_t*)ptr);
 				return;
 			case ZEND_FFI_TYPE_SINT8:
-				ZVAL_LONG(rv, ZEND_FFI_READ_NARROW(int8_t, ptr, is_ret));
+				ZVAL_LONG(rv, *(int8_t*)ptr);
 				return;
 			case ZEND_FFI_TYPE_UINT16:
-				ZVAL_LONG(rv, ZEND_FFI_READ_NARROW(uint16_t, ptr, is_ret));
+				ZVAL_LONG(rv, *(uint16_t*)ptr);
 				return;
 			case ZEND_FFI_TYPE_SINT16:
-				ZVAL_LONG(rv, ZEND_FFI_READ_NARROW(int16_t, ptr, is_ret));
+				ZVAL_LONG(rv, *(int16_t*)ptr);
 				return;
 			case ZEND_FFI_TYPE_UINT32:
-				ZVAL_LONG(rv, ZEND_FFI_READ_NARROW(uint32_t, ptr, is_ret));
+				ZVAL_LONG(rv, *(uint32_t*)ptr);
 				return;
 			case ZEND_FFI_TYPE_SINT32:
-				ZVAL_LONG(rv, ZEND_FFI_READ_NARROW(int32_t, ptr, is_ret));
+				ZVAL_LONG(rv, *(int32_t*)ptr);
 				return;
 			case ZEND_FFI_TYPE_UINT64:
 				ZVAL_LONG(rv, *(uint64_t*)ptr);
@@ -600,10 +635,10 @@ static zend_always_inline void zend_ffi_cdata_to_zval(zend_ffi_cdata *cdata, voi
 				ZVAL_LONG(rv, *(int64_t*)ptr);
 				return;
 			case ZEND_FFI_TYPE_BOOL:
-				ZVAL_BOOL(rv, ZEND_FFI_READ_NARROW(uint8_t, ptr, is_ret));
+				ZVAL_BOOL(rv, *(uint8_t*)ptr);
 				return;
 			case ZEND_FFI_TYPE_CHAR:
-				ZVAL_CHAR(rv, ZEND_FFI_READ_NARROW(char, ptr, is_ret));
+				ZVAL_CHAR(rv, *(char*)ptr);
 				return;
 			case ZEND_FFI_TYPE_ENUM:
 				kind = type->enumeration.kind;