2002-08-23 Martin Baulig <martin@gnome.org>

* struct.cs (MyStructInfo.ctor): Make this work with empty structs; it's not allowed to use foreach() on null. svn path=/trunk/mcs/; revision=6966
mono · Aug 23, 2002 · 709db5d · 709db5d
1 parent f991383
commit 709db5d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 14 deletions.
diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-23  Martin Baulig  <martin@gnome.org>
+
+	* struct.cs (MyStructInfo.ctor): Make this work with empty
+	structs; it's not allowed to use foreach() on null.
+
 2002-08-23  Martin Baulig  <martin@gnome.org>
 
 	* codegen.cs (CodeGen.InitMonoSymbolWriter): Tell the symbol

diff --git a/mcs/mcs/statement.cs b/mcs/mcs/statement.cs
@@ -2105,27 +2105,33 @@ private MyStructInfo (Type type)
 				TypeContainer tc = TypeManager.LookupTypeContainer (type);
 
 				ArrayList fields = tc.Fields;
-				foreach (Field field in fields) {
-					if ((field.ModFlags & Modifiers.STATIC) != 0)
-						continue;
-					if ((field.ModFlags & Modifiers.PUBLIC) != 0)
-						++Count;
-					else
-						++CountNonPublic;
+				if (fields != null) {
+					foreach (Field field in fields) {
+						if ((field.ModFlags & Modifiers.STATIC) != 0)
+							continue;
+						if ((field.ModFlags & Modifiers.PUBLIC) != 0)
+							++Count;
+						else
+							++CountNonPublic;
+					}
 				}
 
 				Fields = new FieldInfo [Count];
 				NonPublicFields = new FieldInfo [CountNonPublic];
 
 				Count = CountNonPublic = 0;
-				foreach (Field field in fields) {
-					if ((field.ModFlags & Modifiers.STATIC) != 0)
-						continue;
-					if ((field.ModFlags & Modifiers.PUBLIC) != 0)
-						Fields [Count++] = field.FieldBuilder;
-					else
-						NonPublicFields [CountNonPublic++] = field.FieldBuilder;
+				if (fields != null) {
+					foreach (Field field in fields) {
+						if ((field.ModFlags & Modifiers.STATIC) != 0)
+							continue;
+						if ((field.ModFlags & Modifiers.PUBLIC) != 0)
+							Fields [Count++] = field.FieldBuilder;
+						else
+							NonPublicFields [CountNonPublic++] =
+								field.FieldBuilder;
+					}
 				}
+
 			} else {
 				Fields = type.GetFields (BindingFlags.Instance|BindingFlags.Public);
 				Count = Fields.Length;