* mcs/flowanalysis.cs (UsageVector.MergeOrigins): Reorganize.

[mono.git] / mcs / gmcs / support.cs

diff --git a/mcs/gmcs/support.cs b/mcs/gmcs/support.cs
index 8db22782050f0f97b348a63f4c562a10c3da3aae..18ef9affaac1c0d8c5097939d9f6ce74d96c2acf 100644 (file)
--- a/mcs/gmcs/support.cs
+++ b/mcs/gmcs/support.cs
@@ -47,7 +47,7 @@ namespace Mono.CSharp {
                        int count = pi.Length-1;
 
                        if (pi.Length == 0) {
-                               types = TypeManager.NoTypes;
+                               types = Type.EmptyTypes;
                        } else {
                                types = new Type [pi.Length];
                                for (int i = 0; i < pi.Length; i++)
@@ -57,10 +57,9 @@ namespace Mono.CSharp {
                        if (count < 0)
                                return;
 
-                       if (mb.Mono_IsInflatedMethod) {
-                               MethodInfo generic = mb.GetGenericMethodDefinition ();
+                       MethodBase generic = TypeManager.DropGenericMethodArguments (mb);
+                       if (generic != mb) {
                                gpd = TypeManager.GetParameterData (generic);
-
                                last_arg_is_params = gpd.HasParams;
                                return;
                        }