Added support for GetGenericDefinition

yaozb-gif · Feb 2, 2019 · 74a5945 · 74a5945
1 parent a3c9ac4
commit 74a5945
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/ILRuntime/CLR/TypeSystem/ILType.cs b/ILRuntime/CLR/TypeSystem/ILType.cs
@@ -39,6 +39,7 @@ public class ILType : IType
         List<ILType> genericInstances;
         bool isDelegate;
         ILRuntimeType reflectionType;
+        ILType genericDefinition;
         IType firstCLRBaseType, firstCLRInterface;
         int hashCode = -1;
         static int instance_id = 0x10000000;
@@ -300,6 +301,11 @@ public bool IsGenericInstance
                 return genericArguments != null;
             }
         }
+
+        public ILType GetGenericDefinition()
+        {
+            return genericDefinition;
+        }
         public KeyValuePair<string, IType>[] GenericArguments
         {
             get
@@ -1117,6 +1123,7 @@ public IType MakeGenericInstance(KeyValuePair<string, IType>[] genericArguments)
                     return i;
             }
             var res = new ILType(definition, appdomain);
+            res.genericDefinition = this;
             res.genericArguments = genericArguments;
 
             genericInstances.Add(res);

diff --git a/ILRuntime/Reflection/ILRuntimeType.cs b/ILRuntime/Reflection/ILRuntimeType.cs
@@ -568,6 +568,13 @@ public override bool IsGenericType
             }
         }
 
+        public override Type GetGenericTypeDefinition()
+        {
+            var def = type.GetGenericDefinition();
+
+            return def != null ? def.ReflectionType : null;
+        }
+
         public override bool IsGenericTypeDefinition
         {
             get

diff --git a/ILRuntime/Reflection/ILRuntimeWrapperType.cs b/ILRuntime/Reflection/ILRuntimeWrapperType.cs
@@ -245,6 +245,11 @@ public override bool IsGenericTypeDefinition
             }
         }
 
+        public override Type GetGenericTypeDefinition()
+        {
+            return et.GetGenericTypeDefinition();
+        }
+
         public override bool IsGenericParameter
         {
             get