2007-09-02 Zoltan Varga <vargaz@gmail.com>

	* TypeBuilder.cs: Add a workaround for #82625 to make nemerle work again.

svn path=/trunk/mcs/; revision=85182

diff --git a/mcs/class/corlib/System.Reflection.Emit/ChangeLog b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
index e7422acdf7e0c2f61c2020ff343aecb8204077d4..80fb736927d33a09d220bbed2960ac051f4c28d1 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/ChangeLog
+++ b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-02  Zoltan Varga  <vargaz@gmail.com>
+
+       * TypeBuilder.cs: Add a workaround for #82625 to make nemerle work again.
+
 2007-08-29  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * AssemblyBuilder.cs: In DefineIconResource, open icon in read-only

diff --git a/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
index 2dc14382fb270991e77b63a2084c80df54fa8a0d..a8d8f2891eb590da2bf493b207cab27572ed245f 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
@@ -964,7 +964,9 @@ namespace System.Reflection.Emit
 
                public override FieldInfo[] GetFields (BindingFlags bindingAttr)
                {
-                       if (created != null)
+                       // FIXME: In the generic case, this leads to a crash
+                       // http://bugzilla.ximian.com/show_bug.cgi?id=82625
+                       if (!ContainsGenericParameters && (created != null))
                                return created.GetFields (bindingAttr);
 
                        if (fields == null)