Author: martin
Date: 2005-03-22 10:28:05 -0500 (Tue, 22 Mar 2005)
New Revision: 42114

Modified:
   trunk/mcs/gmcs/ChangeLog
   trunk/mcs/gmcs/delegate.cs
Log:
2005-03-22  Martin Baulig  <[EMAIL PROTECTED]>

        * delegate.cs (Delegate.VerifyMethod): Call
        TypeManager.GetParameterData() after method inference, not before.



Modified: trunk/mcs/gmcs/ChangeLog
===================================================================
--- trunk/mcs/gmcs/ChangeLog    2005-03-22 15:26:51 UTC (rev 42113)
+++ trunk/mcs/gmcs/ChangeLog    2005-03-22 15:28:05 UTC (rev 42114)
@@ -1,5 +1,10 @@
 2005-03-22  Martin Baulig  <[EMAIL PROTECTED]>
 
+       * delegate.cs (Delegate.VerifyMethod): Call
+       TypeManager.GetParameterData() after method inference, not before.
+
+2005-03-22  Martin Baulig  <[EMAIL PROTECTED]>
+
        * typemanager.cs (TypeManager.LookupMemberCache): Add support for
        generic instances.
 

Modified: trunk/mcs/gmcs/delegate.cs
===================================================================
--- trunk/mcs/gmcs/delegate.cs  2005-03-22 15:26:51 UTC (rev 42113)
+++ trunk/mcs/gmcs/delegate.cs  2005-03-22 15:28:05 UTC (rev 42114)
@@ -474,7 +474,6 @@
                        MethodGroupExpr mg = GetInvokeMethod (ec, 
delegate_type, loc);
                        if (mg == null)
                                return null;
-                       ParameterData pd = TypeManager.GetParameterData (mb);
 
                        MethodBase invoke_mb = mg.Methods [0];
                        ParameterData invoke_pd = TypeManager.GetParameterData 
(invoke_mb);
@@ -483,6 +482,7 @@
                            !TypeManager.InferTypeArguments (ec, invoke_pd, ref 
mb))
                                return null;
 
+                       ParameterData pd = TypeManager.GetParameterData (mb);
                        if (invoke_pd.Count != pd.Count)
                                return null;
 
@@ -1011,7 +1011,7 @@
                                                return null;
                                }
                        }
-                       
+
                        if (!Delegate.VerifyApplicability (ec, del_type, 
Arguments, loc))
                                return null;
 

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to