Fix FieldRef and FieldDef (#208)

Author: josesimoes

MetadataProcessor.Shared/Tables/nanoFieldDefinitionTable.cs

@@ -22,7 +22,7 @@ public sealed class nanoFieldDefinitionTable :
         //////////////////////////////////////////////////////////////////////////////////////////////
         // <SYNC-WITH-NATIVE>                                                                       //
         // when updating this size here need to update matching define in nanoCLR_Types.h in native //
-        private const int sizeOf_CLR_RECORD_FIELDDEF = 8;
+        private const int sizeOf_CLR_RECORD_FIELDDEF = 10;
         //////////////////////////////////////////////////////////////////////////////////////////////
         //////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -35,13 +35,13 @@ private sealed class FieldDefinitionComparer : IEqualityComparer<FieldDefinition
             /// <inheritdoc/>
             public bool Equals(FieldDefinition lhs, FieldDefinition rhs)
             {
-                return string.Equals(lhs.FullName, rhs.FullName, StringComparison.Ordinal);
+                return lhs.MetadataToken.Equals(rhs.MetadataToken);
             }
 
             /// <inheritdoc/>
             public int GetHashCode(FieldDefinition that)
             {
-                return that.FullName.GetHashCode();
+                return that.MetadataToken.GetHashCode();
             }
         }
 
@@ -81,6 +81,7 @@ protected override void WriteSingleItem(
 
             var writerStartPosition = writer.BaseStream.Position;
 
+            WriteStringReference(writer, item.DeclaringType.Name);
             WriteStringReference(writer, item.Name);
             writer.WriteUInt16(_context.SignaturesTable.GetOrCreateSignatureId(item));
 

MetadataProcessor.Shared/Tables/nanoFieldReferenceTable.cs

@@ -22,7 +22,7 @@ public sealed class nanoFieldReferenceTable :
         //////////////////////////////////////////////////////////////////////////////////////////////
         // <SYNC-WITH-NATIVE>                                                                       //
         // when updating this size here need to update matching define in nanoCLR_Types.h in native //
-        private const int sizeOf_CLR_RECORD_FIELDREF = 6;
+        private const int sizeOf_CLR_RECORD_FIELDREF = 8;
         //////////////////////////////////////////////////////////////////////////////////////////////
         //////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -35,13 +35,13 @@ private sealed class MemberReferenceComparer : IEqualityComparer<FieldReference>
             /// <inheritdoc/>
             public bool Equals(FieldReference lhs, FieldReference rhs)
             {
-                return string.Equals(lhs.FullName, rhs.FullName, StringComparison.Ordinal);
+                return lhs.MetadataToken.Equals(rhs.MetadataToken);
             }
 
             /// <inheritdoc/>
             public int GetHashCode(FieldReference that)
             {
-                return that.FullName.GetHashCode();
+                return that.MetadataToken.GetHashCode();
             }
         }
 
@@ -99,6 +99,9 @@ protected override void WriteSingleItem(
                 throw new ArgumentException($"Can't find a type reference for {item.DeclaringType}.");
             }
 
+            // Type
+            WriteStringReference(writer, item.DeclaringType.Name);
+
             // Name
             WriteStringReference(writer, item.Name);