Fixes and improvements on signature generation

Signed-off-by: José Simões <[email protected]>

Author: josesimoes

source/MetadataProcessor.Core/Tables/nanoMethodDefinitionTable.cs

@@ -73,7 +73,7 @@ protected override void WriteSingleItem(
                 ++parametersCount; // add implicit 'this' pointer into non-static methods
             }
 
-            _context.SignaturesTable.WriteDataType(item.ReturnType, writer, false, false);
+            _context.SignaturesTable.WriteDataType(item.ReturnType, writer, false, false, false);
             if (item.ReturnType is TypeSpecification)
             {
                 // developer note

source/MetadataProcessor.Core/Tables/nanoSignaturesTable.cs

@@ -222,13 +222,17 @@ public void WriteDataType(
             TypeReference typeDefinition,
             nanoBinaryWriter writer,
             bool alsoWriteSubType,
-            bool expandEnumType)
+            bool expandEnumType,
+            bool isTypeDefinition)
         {
-            nanoCLR_DataType dataType;
-            if (PrimitiveTypes.TryGetValue(typeDefinition.FullName, out dataType))
+            if (!isTypeDefinition)
             {
-                writer.WriteByte((byte)dataType);
-                return;
+                nanoCLR_DataType dataType;
+                if (PrimitiveTypes.TryGetValue(typeDefinition.FullName, out dataType))
+                {
+                    writer.WriteByte((byte)dataType);
+                    return;
+                }
             }
 
             if (typeDefinition is TypeSpecification)
@@ -274,11 +278,17 @@ public void WriteDataType(
                 if (alsoWriteSubType)
                 {
                     var array = (ArrayType)typeDefinition;
-                    WriteDataType(array.ElementType, writer, true, expandEnumType);
+                    WriteDataType(array.ElementType, writer, true, expandEnumType, isTypeDefinition);
                 }
                 return;
             }
 
+            if(typeDefinition.MetadataType == MetadataType.Object)
+            {
+                writer.WriteByte((byte)nanoCLR_DataType.DATATYPE_CLASS);
+                return;
+            }
+
             writer.WriteByte(0x00);
         }
 
@@ -375,6 +385,10 @@ private byte[] GetSignature(
 
                 if (isFieldSignature)
                 {
+                    //////////////////////////////////////////////////////////
+                    // dev notes: this is coming from
+                    // CorCallingConvention.IMAGE_CEE_CS_CALLCONV_FIELD = 0x06
+                    //////////////////////////////////////////////////////////
                     writer.Write((byte)0x06); // Field signature prefix
                 }
                 WriteTypeInfo(typeReference, binaryWriter);
@@ -538,20 +552,22 @@ private void WriteTypeInfo(
             TypeReference typeReference,
             nanoBinaryWriter writer)
         {
+            // dev notes: from the original MDP
+            // If there is modifier on type record of local variable, we put it before type of local variable.
             if (typeReference.IsOptionalModifier)
             {
-                writer.WriteByte(0); // OpTypeModifier ???
+                writer.WriteByte(0x0); // OpTypeModifier ???
             }
 
             var byReference = typeReference as ByReferenceType;
             if (byReference != null)
             {
                 writer.WriteByte((byte)nanoCLR_DataType.DATATYPE_BYREF);
-                WriteDataType(byReference.ElementType, writer, true, false);
+                WriteDataType(byReference.ElementType, writer, true, false, false);
             }
             else
             {
-                WriteDataType(typeReference, writer, true, false);
+                WriteDataType(typeReference, writer, true, false, false);
             }
         }
 

source/MetadataProcessor.Core/Tables/nanoTypeDefinitionTable.cs

@@ -105,11 +105,6 @@ protected override void WriteSingleItem(
                 .Where(field => !field.HasConstant)
                 .OrderByDescending(field => field.IsStatic)
                 .ToList();
-            foreach (var field in fieldsList)
-            {
-                _context.SignaturesTable.GetOrCreateSignatureId(field);
-                _context.SignaturesTable.GetOrCreateSignatureId(field.InitialValue);
-            }
 
             using (var stream = new MemoryStream(6))
             {
@@ -140,7 +135,7 @@ protected override void WriteSingleItem(
 
                 WriteMethodBodies(item.Methods, item.Interfaces, writer);
 
-                _context.SignaturesTable.WriteDataType(item, writer, false, true);
+                _context.SignaturesTable.WriteDataType(item, writer, false, true, true);
 
                 writer.WriteBytes(stream.ToArray());
             }
@@ -154,45 +149,56 @@ private void WriteClassFields(
         {
             ushort firstStaticFieldId = 0;
             var staticFieldsCount = 0;
-            foreach (var field in fieldsList.Where(item => item.IsStatic && !item.IsLiteral))
+            foreach (var field in fieldsList.Where(item => item.IsStatic))
             {
                 ushort fieldReferenceId;
-                _context.FieldsTable.TryGetFieldReferenceId(field, true, out fieldReferenceId);
-
-                if (staticFieldsCount == 0)
+                if (_context.FieldsTable.TryGetFieldReferenceId(field, false, out fieldReferenceId))
                 {
-                    // this is to be checked only on the 1st pass
-                    firstStaticFieldId = Math.Min(_context.FieldsTable.MaxFieldId, fieldReferenceId);
-                }
+                    if (staticFieldsCount == 0)
+                    {
+                        // this is to be checked only on the 1st pass
+                        firstStaticFieldId = fieldReferenceId;
+                    }
 
-                _context.SignaturesTable.GetOrCreateSignatureId(field);
-                _context.StringTable.GetOrCreateStringId(field.Name);
+                    _context.SignaturesTable.GetOrCreateSignatureId(field);
+                    _context.SignaturesTable.GetOrCreateSignatureId(field.InitialValue);
+                    _context.StringTable.GetOrCreateStringId(field.Name);
 
-                ++staticFieldsCount;
+                    ++staticFieldsCount;
+                }
+                else
+                {
+                    // field ID not found!!
+                }
             }
 
             ushort firstInstanceFieldId = 0;
             var instanceFieldsCount = 0;
-            foreach (var field in fieldsList.Where(item => !item.IsStatic && !item.IsLiteral))
+            foreach (var field in fieldsList.Where(item => !item.IsStatic))
             {
                 ushort fieldReferenceId;
-                _context.FieldsTable.TryGetFieldReferenceId(field, true, out fieldReferenceId);
-
-                if (instanceFieldsCount == 0)
+                if (_context.FieldsTable.TryGetFieldReferenceId(field, false, out fieldReferenceId))
                 {
-                    // this is to be checked only on the 1st pass
-                    firstInstanceFieldId = Math.Min(_context.FieldsTable.MaxFieldId, fieldReferenceId);
-                }
+                    if (instanceFieldsCount == 0)
+                    {
+                        // this is to be checked only on the 1st pass
+                        firstInstanceFieldId = fieldReferenceId;
+                    }
 
-                _context.SignaturesTable.GetOrCreateSignatureId(field);
-                _context.StringTable.GetOrCreateStringId(field.Name);
+                    _context.SignaturesTable.GetOrCreateSignatureId(field);
+                    _context.StringTable.GetOrCreateStringId(field.Name);
 
-                ++instanceFieldsCount;
+                    ++instanceFieldsCount;
+                }
+                else
+                {
+                    // field ID not found!!
+                }
             }
 
             if (firstStaticFieldId < firstInstanceFieldId)
             {
-                if (instanceFieldsCount > 0 && staticFieldsCount > 0)
+                if (instanceFieldsCount > 0 && staticFieldsCount == 0)
                 {
                     firstStaticFieldId = firstInstanceFieldId;
                 }