2010-05-05 Marek Safar <marek.safar@gmail.com>

* import.cs: Don't import private fields. svn path=/trunk/mcs/; revision=156712
mkorkalo · May 5, 2010 · 802a9a6 · 802a9a6
1 parent ab07538
commit 802a9a6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-05  Marek Safar  <marek.safar@gmail.com>
+
+	* import.cs: Don't import private fields.
+
 2010-04-30  Marek Safar  <marek.safar@gmail.com>
 
 	Partially based on patch by <sami.lamti@gmail.com>

diff --git a/mcs/mcs/import.cs b/mcs/mcs/import.cs
@@ -89,6 +89,10 @@ public static FieldSpec CreateField (FieldInfo fi, TypeSpec declaringType)
 					break;
 			}
 
+			// Ignore private fields (even for error reporting) to not require extra dependencies
+			if (mod == Modifiers.PRIVATE)
+				return null;
+
 			var definition = new ImportedMemberDefinition (fi);
 
 			if ((fa & FieldAttributes.Literal) != 0) {
@@ -1056,6 +1060,9 @@ public MemberCache LoadMembers (TypeSpec declaringType)
 						continue;
 
 					imported = Import.CreateField (fi, declaringType);
+					if (imported == null)
+						continue;
+
 					break;
 				case MemberTypes.NestedType:
 					Type t = (Type) member;