Backport from trunk/76149 2007-04-23 Marek Safar <marek.safar@gmail.com>

A fix for bug #81414 * delegate.cs: Better fix, moved ApplyAttributes from Define to Emit. svn path=/branches/mono-1-2-4/mcs/; revision=76153
baulig · Apr 23, 2007 · ea18aae · ea18aae
1 parent 9c4001a
commit ea18aae
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-23  Marek Safar  <marek.safar@gmail.com>
+
+	A fix for bug #81414
+	* delegate.cs: Better fix, moved ApplyAttributes from Define to Emit.
+
 2007-04-19  Martin Baulig  <martin@ximian.com>
 
 	* convert.cs

diff --git a/mcs/mcs/delegate.cs b/mcs/mcs/delegate.cs
@@ -265,7 +265,6 @@ public override bool Define ()
 				mattr, cc, TypeManager.iasyncresult_type, async_parameters.Types);
 
 			BeginInvokeBuilder.SetImplementationFlags (MethodImplAttributes.Runtime);
-			async_parameters.ApplyAttributes (BeginInvokeBuilder);
 			TypeManager.RegisterMethod (BeginInvokeBuilder, async_parameters);
 
 			//
@@ -323,6 +322,9 @@ public override void Emit ()
 		{
 			Parameters.ApplyAttributes (InvokeBuilder);
 
+			Parameters p = (Parameters)TypeManager.GetParameterData (BeginInvokeBuilder);
+			p.ApplyAttributes (BeginInvokeBuilder);
+
 			if (OptAttributes != null) {
 				OptAttributes.Emit ();
 			}