Backport r76051 to fix #81414, from Marek Safar

svn path=/branches/mono-1-2-4/mcs/; revision=76062
mono · Apr 22, 2007 · 1cc7889 · 1cc7889
1 parent b6341e0
commit 1cc7889
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-22  Marek Safar  <marek.safar@gmail.com>
+
+	A fix for bug #81414
+	* typemanager.cs: Earlier initialization of params attribute ctor.
+
 2007-04-19  Martin Baulig  <martin@ximian.com>
 
 	* convert.cs

diff --git a/mcs/mcs/typemanager.cs b/mcs/mcs/typemanager.cs
@@ -1187,6 +1187,11 @@ public static void InitCoreTypes ()
 		system_asynccallback_expr.Type = asynccallback_type;
 		system_iasyncresult_expr.Type = iasyncresult_type;
 
+		//
+		// Params contructor is used in delegate ApplyAttributes before we call InitCodeHelpers
+		//
+		cons_param_array_attribute = GetConstructor (param_array_type, Type.EmptyTypes);
+
 		//
 		// These are only used for compare purposes
 		//
@@ -1314,7 +1319,6 @@ public static void InitCodeHelpers ()
 		//
 		unverifiable_code_ctor = GetConstructor (unverifiable_code_type, Type.EmptyTypes);
 		default_member_ctor = GetConstructor (default_member_type, string_);
-		cons_param_array_attribute = GetConstructor (param_array_type, Type.EmptyTypes);
 
 		Type[] short_arg = { short_type };
 		struct_layout_attribute_ctor = GetConstructor (struct_layout_attribute_type, short_arg);