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

* TypeBuilder.cs: Add a workaround for #82625 to make nemerle work again. svn path=/branches/mono-1-2-5/mcs/; revision=85183
baulig · Sep 2, 2007 · d0b80da · d0b80da
1 parent 14f69f6
commit d0b80da
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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-07-11  Rodrigo Kumpera <rkumpera@novell.com>
 
 	* TypeBuilder.cs (CreateType): method did not check for enum type with defined methods and fixed compatibility issue in case of calling CreateType again after the first one failed, it now returns null as well.

diff --git a/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
@@ -964,7 +964,9 @@ public override FieldInfo GetField (string name, BindingFlags bindingAttr)
 
 		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)