[Mono-dev] patch for reading assemblies

[Eyal Alaluf]

Hi, JB.

We have a toold that generates assemblies and when running Cecil to read assemblies
generated by this tool we hit a bug in Cecil. The bug is that Cecil code in
Mono.Cecil.ReflectionRead.VisitTypeDefinitionCollection assumed that an outer class
must appear nt the type reference table before its inner classes.
The attached patch fixes this issue.
Please review.

Eyal.
-------------- next part --------------
Index: Mono.Cecil/ReflectionReader.cs

===================================================================

--- Mono.Cecil/ReflectionReader.cs	(revision 59261)

+++ Mono.Cecil/ReflectionReader.cs	(working copy)

@@ -398,36 +398,7 @@

 				m_typeRefs = new TypeReference [typesRef.Rows.Count];
 
 				for (int i = 0; i < typesRef.Rows.Count; i++) {
-					TypeRefRow type = typesRef [i];
-					IMetadataScope scope = null;
-					TypeReference parent = null;
-					switch (type.ResolutionScope.TokenType) {
-					case TokenType.AssemblyRef :
-						scope = m_module.AssemblyReferences [(int) type.ResolutionScope.RID - 1];
-						break;
-					case TokenType.ModuleRef :
-						scope = m_module.ModuleReferences [(int) type.ResolutionScope.RID - 1];
-						break;
-					case TokenType.Module :
-						scope = m_module.Assembly.Modules [(int) type.ResolutionScope.RID - 1];
-						break;
-					case TokenType.TypeRef :
-						parent = GetTypeRefAt (type.ResolutionScope.RID);
-						scope = parent.Scope;
-						break;
-					}
-
-					TypeReference t = new TypeReference (
-						m_root.Streams.StringsHeap [type.Name],
-						m_root.Streams.StringsHeap [type.Namespace],
-						scope);
-					t.MetadataToken = MetadataToken.FromMetadataRow (TokenType.TypeRef, i);
-
-					if (parent != null)
-						t.DeclaringType = parent;
-
-					m_typeRefs [i] = t;
-					m_module.TypeReferences.Add (t);
+					AddTypeRef(typesRef, i);
 				}
 
 			} else
@@ -451,6 +422,45 @@

 			ReadMemberReferences ();
 		}
 
+		void AddTypeRef(TypeRefTable typesRef, int i)
+		{
+			// Check if index has been already added.
+			if (m_typeRefs[i] != null)
+				return;
+
+			TypeRefRow type = typesRef [i];
+			IMetadataScope scope = null;
+			TypeReference parent = null;
+			switch (type.ResolutionScope.TokenType) {
+			case TokenType.AssemblyRef :
+				scope = m_module.AssemblyReferences [(int) type.ResolutionScope.RID - 1];
+				break;
+			case TokenType.ModuleRef :
+				scope = m_module.ModuleReferences [(int) type.ResolutionScope.RID - 1];
+				break;
+			case TokenType.Module :
+				scope = m_module.Assembly.Modules [(int) type.ResolutionScope.RID - 1];
+				break;
+			case TokenType.TypeRef :
+				AddTypeRef(typesRef, (int)type.ResolutionScope.RID - 1);
+				parent = GetTypeRefAt (type.ResolutionScope.RID);
+				scope = parent.Scope;
+				break;
+			}
+
+			TypeReference t = new TypeReference (
+				m_root.Streams.StringsHeap [type.Name],
+				m_root.Streams.StringsHeap [type.Namespace],
+				scope);
+			t.MetadataToken = MetadataToken.FromMetadataRow (TokenType.TypeRef, i);
+
+			if (parent != null)
+				t.DeclaringType = parent;
+
+			m_typeRefs [i] = t;
+			m_module.TypeReferences.Add (t);
+		}
+
 		void ReadTypeSpecs ()
 		{
 			if (!m_tHeap.HasTable (typeof (TypeSpecTable)))
Index: ChangeLog

===================================================================

--- ChangeLog	(revision 59261)

+++ ChangeLog	(working copy)

@@ -1,3 +1,8 @@

+2006-04-09  Eyal Alaluf  <eyala at mainsoft.com>
+    * Mono.Cecil/ReflectionReader.cs
+	    Cannot assume that TypeRefs are ordered is such a way that an outer
+		class index comes always before all its inner classes.
+
 2006-04-06  Jb Evain  <jbevain at gmail.com>
 
 	* Mono.Cecil/ReflectionWriter.cs