Raise an exception for user types under FULL_AOT_RUNTIME instead of crashing.

diff --git a/mcs/class/corlib/System.Reflection/MonoMethod.cs b/mcs/class/corlib/System.Reflection/MonoMethod.cs
index 79d9e15a18d03e589618fabc7475c4dcea39b581..fe381b93a9db15f6cc4627d604c6dd7d207e0b4f 100644 (file)
--- a/mcs/class/corlib/System.Reflection/MonoMethod.cs
+++ b/mcs/class/corlib/System.Reflection/MonoMethod.cs
@@ -394,8 +394,10 @@ namespace System.Reflection {
                                        hasUserType = true;
                        }
 
-#if !FULL_AOT_RUNTIME
                        if (hasUserType)
+#if FULL_AOT_RUNTIME
+                               throw new NotSupportedException ("User types are not supported under full aot");
+#else
                                return new MethodOnTypeBuilderInst (this, methodInstantiation);
 #endif
 

diff --git a/mcs/class/corlib/System/Type.cs b/mcs/class/corlib/System/Type.cs
index 8371a43b4f53fcec221cab9c2597bc707a746abd..8b6b970747c7f86955706765d4562e54d5a9581d 100644 (file)
--- a/mcs/class/corlib/System/Type.cs
+++ b/mcs/class/corlib/System/Type.cs
@@ -1442,11 +1442,13 @@ namespace System {
                                systemTypes [i] = t;
                        }
 
-#if !FULL_AOT_RUNTIME
                        if (hasUserType) {
+#if FULL_AOT_RUNTIME
+                               throw new NotSupportedException ("User types are not supported under full aot");
+#else
                                return new MonoGenericClass (this, typeArguments);
-                       }
 #endif
+                       }
 
                        Type res = MakeGenericType (this, systemTypes);
                        if (res == null)