Resolver improvements

src/EazyDevirt/Core/Architecture/InlineOperands/VMInlineOperandData.cs

@@ -40,24 +40,20 @@ public static VMInlineOperandData Read(BinaryReader reader)
 internal record VMTypeData : VMInlineOperandData
 {
     public string Name { get; }
-    public bool HasGenericTypeArgs { get; }
-    public bool IsGenericParameterType { get; }
-    public int GenericArgumentIndex { get; } 
-    public int GenericTypeArgumentIndex { get; }
-    public VMInlineOperand[] GenericTypes { get; }
-
-    public TypeName TypeName { get; }
+    public bool HasGenericTypeParameters { get; }
+    public bool IsGenericParameterIndex { get; }
+    public int GenericMethodParameterIndex { get; } 
+    public int GenericTypeParameterIndex { get; }
+    public VMInlineOperand[] GenericParameters { get; }
 
     public VMTypeData(BinaryReader reader) : base(VMInlineOperandType.Type)
     {
         Name = reader.ReadString();
-        HasGenericTypeArgs = reader.ReadBoolean();
-        IsGenericParameterType = reader.ReadBoolean();
-        GenericArgumentIndex = reader.ReadInt32();
-        GenericTypeArgumentIndex = reader.ReadInt32();
-        GenericTypes = VMInlineOperand.ReadArrayInternal(reader);
-
-        TypeName = new TypeName(Name);
+        HasGenericTypeParameters = reader.ReadBoolean();
+        IsGenericParameterIndex = reader.ReadBoolean();
+        GenericMethodParameterIndex = reader.ReadInt32();
+        GenericTypeParameterIndex = reader.ReadInt32();
+        GenericParameters = VMInlineOperand.ReadArrayInternal(reader);
     }
 }
 
@@ -70,16 +66,6 @@ internal record VMFieldData : VMInlineOperandData
     public string Name { get; }
     public bool IsStatic { get; }
 
-    public BindingFlags BindingFlags
-    {
-        get
-        {
-            var bindingFlags = BindingFlags.Public | BindingFlags.NonPublic;
-            bindingFlags |= IsStatic ? BindingFlags.Static : BindingFlags.Instance;
-            return bindingFlags;
-        }
-    }
-
     public VMFieldData(BinaryReader reader) : base(VMInlineOperandType.Field)
     {
         DeclaringType = VMInlineOperand.ReadInternal(reader);
@@ -97,11 +83,11 @@ internal record VMMethodData : VMInlineOperandData
     public byte Flags { get; } 
 
     public bool IsStatic { get; } 
-    public bool HasGenericArguments { get; }
+    public bool HasGenericParameters { get; }
     public string Name { get; } 
     public VMInlineOperand ReturnType { get; } 
     public VMInlineOperand[] Parameters { get; } 
-    public VMInlineOperand[] GenericArguments { get; } 
+    public VMInlineOperand[] GenericParameters { get; } 
 
     public BindingFlags BindingFlags
     {
@@ -119,11 +105,11 @@ public VMMethodData(BinaryReader reader) : base(VMInlineOperandType.Method)
         Flags = reader.ReadByte();
         // these constants are also different between versions (#3)
         IsStatic = (Flags & 1) > 0;
-        HasGenericArguments = (Flags & 2) > 0;
+        HasGenericParameters = (Flags & 2) > 0;
         Name = reader.ReadString();
         ReturnType = VMInlineOperand.ReadInternal(reader);
         Parameters = VMInlineOperand.ReadArrayInternal(reader);
-        GenericArguments = VMInlineOperand.ReadArrayInternal(reader);
+        GenericParameters = VMInlineOperand.ReadArrayInternal(reader);
     }
 }