Fix processing of generic type (#129)

nanoframework · Dec 29, 2020 · 3206add · 3206add
1 parent b2b663f
commit 3206add
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 9 deletions.
diff --git a/MetadataProcessor.Core/Tables/nanoMethodDefinitionTable.cs b/MetadataProcessor.Core/Tables/nanoMethodDefinitionTable.cs
@@ -1,6 +1,7 @@
 using Mono.Cecil;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 
 namespace nanoFramework.Tools.MetadataProcessor
 {
@@ -11,6 +12,8 @@ namespace nanoFramework.Tools.MetadataProcessor
     public sealed class nanoMethodDefinitionTable :
         nanoReferenceTableBase<MethodDefinition>
     {
+        private const int sizeOf_CLR_RECORD_METHODDEF = 16;
+
         /// <summary>
         /// Helper class for comparing two instances of <see cref="MethodDefinition"/> objects
         /// using <see cref="MethodDefinition.FullName"/> property as unique key for comparison.
@@ -62,6 +65,8 @@ protected override void WriteSingleItem(
             nanoBinaryWriter writer,
             MethodDefinition item)
         {
+            var writerStartPosition = writer.BaseStream.Position;
+
             if (!_context.MinimizeComplete)
             {
                 return;
@@ -118,6 +123,10 @@ protected override void WriteSingleItem(
             }
 
             writer.WriteUInt16(methodSignature);
+
+            var writerEndPosition = writer.BaseStream.Position;
+
+            Debug.Assert((writerEndPosition - writerStartPosition) == sizeOf_CLR_RECORD_METHODDEF);
         }
 
         public static uint GetFlags(MethodDefinition method)
@@ -149,6 +158,9 @@ public static uint GetFlags(MethodDefinition method)
             const uint MD_DelegateBeginInvoke =     0x00040000;
             const uint MD_DelegateEndInvoke =       0x00080000;
 
+            const uint MD_ContainsGenericParameter =    0x00100000;
+            const uint MD_HasGenericParameter =         0x00200000;
+
             const uint MD_Synchronized =            0x01000000;
             const uint MD_GloballySynchronized =    0x02000000;
             const uint MD_Patched =                 0x04000000;
@@ -276,6 +288,16 @@ public static uint GetFlags(MethodDefinition method)
                 }
             }
 
+            if (method.ContainsGenericParameter)
+            {
+                flag |= MD_ContainsGenericParameter;
+            }
+
+            if (method.HasGenericParameters)
+            {
+                flag |= MD_HasGenericParameter;
+            }
+
             return flag;
         }
     }

diff --git a/MetadataProcessor.Core/Tables/nanoSignaturesTable.cs b/MetadataProcessor.Core/Tables/nanoSignaturesTable.cs
@@ -316,6 +316,19 @@ public void WriteDataType(
                 return;
             }
 
+            if (typeDefinition.MetadataType == MetadataType.Var)
+            {
+                writer.WriteByte((byte)nanoCLR_DataType.DATATYPE_MVAR);
+
+                if (alsoWriteSubType)
+                {
+                    // following ECMA-335 VI.B.4.3 Metadata
+                    writer.WriteByte((byte)(typeDefinition as GenericParameter).Position);
+                }
+
+                return;
+            }
+
             if (typeDefinition.IsArray)
             {
                 writer.WriteByte((byte)nanoCLR_DataType.DATATYPE_SZARRAY);
@@ -371,15 +384,6 @@ public void WriteDataType(
                 return;
             }
 
-            if (typeDefinition.IsGenericParameter)
-            {
-                // following ECMA-335 VI.B.4.3 Metadata
-
-                writer.WriteByte((byte)nanoCLR_DataType.DATATYPE_MVAR);
-                writer.WriteByte((byte)(typeDefinition as GenericParameter).Position);
-                return;
-            }
-
             writer.WriteByte(0x00);
         }