From 1cc7889017b1ae475f36a61a369e790f6234d794 Mon Sep 17 00:00:00 2001 From: Miguel de Icaza Date: Sun, 22 Apr 2007 15:47:03 +0000 Subject: [PATCH] Backport r76051 to fix #81414, from Marek Safar svn path=/branches/mono-1-2-4/mcs/; revision=76062 --- mcs/mcs/ChangeLog | 5 +++++ mcs/mcs/typemanager.cs | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog index 28ccd518a0444..283755f190cbe 100644 --- a/mcs/mcs/ChangeLog +++ b/mcs/mcs/ChangeLog @@ -1,3 +1,8 @@ +2007-04-22 Marek Safar + + A fix for bug #81414 + * typemanager.cs: Earlier initialization of params attribute ctor. + 2007-04-19 Martin Baulig * convert.cs diff --git a/mcs/mcs/typemanager.cs b/mcs/mcs/typemanager.cs index 37910f3e5569a..72af28d5c3ffb 100644 --- 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);