Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / mono / mini / mini-arm64-gsharedvt.c

diff --git a/mono/mini/mini-arm64-gsharedvt.c b/mono/mini/mini-arm64-gsharedvt.c
index 3d9664b56bfde0998bb87aefb64287777b929571..c50ef05a38953a16e86b454ce9025bd93f8bb2b0 100644 (file)
--- a/mono/mini/mini-arm64-gsharedvt.c
+++ b/mono/mini/mini-arm64-gsharedvt.c
@@ -1,5 +1,6 @@
-/*
- * mini-arm64-gsharedvt.c: gsharedvt support code for arm64
+/**
+ * \file
+ * gsharedvt support code for arm64
  *
  * Authors:
  *   Zoltan Varga <vargaz@gmail.com>
@@ -14,7 +15,7 @@
 /*
  * GSHAREDVT
  */
-#ifdef MONO_ARCH_GSHARED_SUPPORTED
+#ifdef MONO_ARCH_GSHAREDVT_SUPPORTED
 
 #define ALIGN_TO(val,align) ((((guint64)val) + ((align) - 1)) & ~((align) - 1))
 
@@ -347,19 +348,19 @@ mono_arch_get_gsharedvt_call_info (gpointer addr, MonoMethodSignature *normal_si
                        if (!gsharedvt_in || sig->ret->byref) {
                                info->ret_marshal = GSHAREDVT_RET_I8;
                        } else {
-                               switch (sig->ret->type) {
+                               MonoType *rtype = mini_get_underlying_type (sig->ret);
+
+                               switch (rtype->type) {
                                case MONO_TYPE_I1:
                                        info->ret_marshal = GSHAREDVT_RET_I1;
                                        break;
                                case MONO_TYPE_U1:
-                               case MONO_TYPE_BOOLEAN:
                                        info->ret_marshal = GSHAREDVT_RET_U1;
                                        break;
                                case MONO_TYPE_I2:
                                        info->ret_marshal = GSHAREDVT_RET_I2;
                                        break;
                                case MONO_TYPE_U2:
-                               case MONO_TYPE_CHAR:
                                        info->ret_marshal = GSHAREDVT_RET_U2;
                                        break;
                                case MONO_TYPE_I4:
@@ -415,4 +416,4 @@ mono_arm_gsharedvt_init (void)
 {
 }
 
-#endif /* MONO_ARCH_GSHARED_SUPPORTED */
\ No newline at end of file
+#endif /* MONO_ARCH_GSHAREDVT_SUPPORTED */