Remove DATATYPE_GENERIC (#123)

josesimoes · web-flow · commit 46ec21d3cb05 · 2020-12-09T12:43:29.000Z
***NO_CI***
diff --git a/MetadataProcessor.Core/Tables/nanoSignaturesTable.cs b/MetadataProcessor.Core/Tables/nanoSignaturesTable.cs
@@ -349,9 +349,11 @@ public void WriteDataType(
                 return;
             }
 
-            if (typeDefinition.IsGenericParameter|| typeDefinition.IsGenericInstance)
+            if (typeDefinition.IsGenericParameter)
             {
-                writer.WriteByte((byte)nanoCLR_DataType.DATATYPE_GENERIC);
+                // generic parameter should be declared as object
+                // the CLR is able to resolve to the correct type
+                writer.WriteByte((byte)nanoCLR_DataType.DATATYPE_OBJECT);
                 return;
             }
 
diff --git a/MetadataProcessor.Core/Utility/nanoCLR_DataType.cs b/MetadataProcessor.Core/Utility/nanoCLR_DataType.cs
@@ -47,7 +47,6 @@ public enum nanoCLR_DataType : byte
         DATATYPE_LAST_PRIMITIVE = DATATYPE_STRING,
 
         DATATYPE_OBJECT, // Shortcut for System.Object
-        DATATYPE_GENERIC = DATATYPE_OBJECT,
         DATATYPE_CLASS, // CLASS <class Token>
         DATATYPE_VALUETYPE, // VALUETYPE <class Token>
         DATATYPE_SZARRAY, // Shortcut for single dimension zero lower bound array SZARRAY <type>

Original file line number	Diff line number	Diff line change
`@@ -349,9 +349,11 @@ public void WriteDataType(`
`349`	`349`	`return;`
`350`	`350`	`}`
`351`	`351`
`352`		`- if (typeDefinition.IsGenericParameter\|\| typeDefinition.IsGenericInstance)`
	`352`	`+ if (typeDefinition.IsGenericParameter)`
`353`	`353`	`{`
`354`		`- writer.WriteByte((byte)nanoCLR_DataType.DATATYPE_GENERIC);`
	`354`	`+ // generic parameter should be declared as object`
	`355`	`+ // the CLR is able to resolve to the correct type`
	`356`	`+ writer.WriteByte((byte)nanoCLR_DataType.DATATYPE_OBJECT);`
`355`	`357`	`return;`
`356`	`358`	`}`
`357`	`359`