[jit] Increase the buffer size used by the dyncall data structures to 512, add a...

diff --git a/mono/mini/aot-tests.cs b/mono/mini/aot-tests.cs
index 7b92c8fe1f1d396414672b82bd3c220d2d5e0e21..6092346ea4ccb21349b8d22bba00ef891fad4a79 100644 (file)
--- a/mono/mini/aot-tests.cs
+++ b/mono/mini/aot-tests.cs
@@ -370,4 +370,35 @@ class Tests
                return 0;
        }
 
+       struct LargeStruct {
+               public int a, b, c, d;
+       }
+
+       [MethodImplAttribute (MethodImplOptions.NoInlining)]
+       public static bool GetHasValue<T>(T? value) where T : struct
+       {
+               return value.HasValue;
+       }
+
+       [Category ("DYNCALL")]
+       public static int test_0_large_nullable_invoke () {
+               var s = new LargeStruct () { a = 1, b = 2, c = 3, d = 4 };
+
+               GetHasValue<LargeStruct> (s);
+
+#if __MOBILE__
+               var m = typeof(AotTests).GetMethod("GetHasValue", BindingFlags.Static | BindingFlags.Public);
+#else
+               var m = typeof(Tests).GetMethod("GetHasValue", BindingFlags.Static | BindingFlags.Public);
+#endif
+
+               Type type = typeof (LargeStruct?).GetGenericArguments () [0];
+               bool b1 = (bool)m.MakeGenericMethod (new Type[] {type}).Invoke (null, new object[] { s });
+               if (!b1)
+                       return 1;
+               bool b2 = (bool)m.MakeGenericMethod (new Type[] {type}).Invoke (null, new object[] { null });
+               if (b2)
+                       return 2;
+               return 0;
+       }
 }

diff --git a/mono/mini/mini-runtime.c b/mono/mini/mini-runtime.c
index 9a8dcd5535907dcdc1d194d74c6400ceed644bd4..e7db1b4318e9510d6a1cf88acf700515114defe8 100644 (file)
--- a/mono/mini/mini-runtime.c
+++ b/mono/mini/mini-runtime.c
@@ -2339,7 +2339,7 @@ mono_jit_runtime_invoke (MonoMethod *method, void *obj, void **params, MonoObjec
                gpointer *args;
                static RuntimeInvokeDynamicFunction dyn_runtime_invoke;
                int i, pindex;
-               guint8 buf [256];
+               guint8 buf [512];
                guint8 retval [256];
                gpointer rgctx;