Convert CIL.GenericContext to interface

Author: tamasvajk

csharp/extractor/Semmle.Extraction.CIL/Context.Factories.cs

@@ -95,11 +95,11 @@ public PrimitiveType Create(PrimitiveTypeCode code)
         /// <param name="h">The handle of the entity.</param>
         /// <param name="genericContext">The generic context.</param>
         /// <returns></returns>
-        public IExtractedEntity CreateGeneric(GenericContext genericContext, Handle h) => genericHandleFactory[genericContext, h];
+        public IExtractedEntity CreateGeneric(IGenericContext genericContext, Handle h) => genericHandleFactory[genericContext, h];
 
-        private readonly GenericContext defaultGenericContext;
+        private readonly IGenericContext defaultGenericContext;
 
-        private IExtractedEntity CreateGenericHandle(GenericContext gc, Handle handle)
+        private IExtractedEntity CreateGenericHandle(IGenericContext gc, Handle handle)
         {
             IExtractedEntity entity;
             switch (handle.Kind)
@@ -136,7 +136,7 @@ private IExtractedEntity CreateGenericHandle(GenericContext gc, Handle handle)
             return entity;
         }
 
-        private IExtractedEntity Create(GenericContext gc, MemberReferenceHandle handle)
+        private IExtractedEntity Create(IGenericContext gc, MemberReferenceHandle handle)
         {
             var mr = MdReader.GetMemberReference(handle);
             switch (mr.GetKind())
@@ -228,7 +228,7 @@ private Namespace CreateNamespace(NamespaceDefinitionHandle handle)
 
         #endregion
 
-        private readonly CachedFunction<GenericContext, Handle, IExtractedEntity> genericHandleFactory;
+        private readonly CachedFunction<IGenericContext, Handle, IExtractedEntity> genericHandleFactory;
 
         /// <summary>
         /// Gets the short name of a member, without the preceding interface qualifier.

csharp/extractor/Semmle.Extraction.CIL/Context.cs

@@ -37,7 +37,7 @@ public Context(Extraction.Context cx, string assemblyPath, bool extractPdbs)
 
             globalNamespace = new Lazy<Entities.Namespace>(() => Populate(new Entities.Namespace(this, "", null)));
             systemNamespace = new Lazy<Entities.Namespace>(() => Populate(new Entities.Namespace(this, "System")));
-            genericHandleFactory = new CachedFunction<GenericContext, Handle, IExtractedEntity>(CreateGenericHandle);
+            genericHandleFactory = new CachedFunction<IGenericContext, Handle, IExtractedEntity>(CreateGenericHandle);
             namespaceFactory = new CachedFunction<StringHandle, Entities.Namespace>(n => CreateNamespace(MdReader.GetString(n)));
             namespaceDefinitionFactory = new CachedFunction<NamespaceDefinitionHandle, Entities.Namespace>(CreateNamespace);
             sourceFiles = new CachedFunction<PDB.ISourceFile, Entities.PdbSourceFile>(path => new Entities.PdbSourceFile(this, path));

csharp/extractor/Semmle.Extraction.CIL/EmptyContext.cs

@@ -5,14 +5,18 @@ namespace Semmle.Extraction.CIL
     /// <summary>
     /// A generic context which does not contain any type parameters.
     /// </summary>
-    public class EmptyContext : GenericContext
+    public class EmptyContext : IGenericContext
     {
-        public EmptyContext(Context cx) : base(cx)
+        public EmptyContext(Context cx)
         {
+            Cx = cx;
         }
 
-        public override IEnumerable<Entities.Type> TypeParameters { get { yield break; } }
+        public Context Cx { get; }
+
+        public IEnumerable<Entities.Type> TypeParameters { get { yield break; } }
+
+        public IEnumerable<Entities.Type> MethodParameters { get { yield break; } }
 
-        public override IEnumerable<Entities.Type> MethodParameters { get { yield break; } }
     }
 }

csharp/extractor/Semmle.Extraction.CIL/Entities/DefinitionMethod.cs

@@ -23,7 +23,7 @@ internal sealed class DefinitionMethod : Method
 
         public override IList<LocalVariable>? LocalVariables => locals;
 
-        public DefinitionMethod(GenericContext gc, MethodDefinitionHandle handle) : base(gc)
+        public DefinitionMethod(IGenericContext gc, MethodDefinitionHandle handle) : base(gc)
         {
             md = Cx.MdReader.GetMethodDefinition(handle);
             this.gc = gc;

csharp/extractor/Semmle.Extraction.CIL/Entities/ExceptionRegion.cs

@@ -7,13 +7,13 @@ namespace Semmle.Extraction.CIL.Entities
     /// </summary>
     internal class ExceptionRegion : UnlabelledEntity
     {
-        private readonly GenericContext gc;
+        private readonly IGenericContext gc;
         private readonly MethodImplementation method;
         private readonly int index;
         private readonly System.Reflection.Metadata.ExceptionRegion r;
         private readonly Dictionary<int, Instruction> jump_table;
 
-        public ExceptionRegion(GenericContext gc, MethodImplementation method, int index, System.Reflection.Metadata.ExceptionRegion r, Dictionary<int, Instruction> jump_table) : base(gc.Cx)
+        public ExceptionRegion(IGenericContext gc, MethodImplementation method, int index, System.Reflection.Metadata.ExceptionRegion r, Dictionary<int, Instruction> jump_table) : base(gc.Cx)
         {
             this.gc = gc;
             this.method = method;

csharp/extractor/Semmle.Extraction.CIL/Entities/Field.cs

@@ -8,10 +8,11 @@ namespace Semmle.Extraction.CIL.Entities
     /// <summary>
     /// An entity representing a field.
     /// </summary>
-    internal abstract class Field : GenericContext, IMember, ICustomModifierReceiver
+    internal abstract class Field : IGenericContext, IMember, ICustomModifierReceiver
     {
-        protected Field(Context cx) : base(cx)
+        protected Field(Context cx)
         {
+            Cx = cx;
         }
 
         public Label Label { get; set; }
@@ -61,5 +62,11 @@ public void Extract(Context cx2)
         }
 
         TrapStackBehaviour IEntity.TrapStackBehaviour => TrapStackBehaviour.NoLabel;
+
+        public abstract IEnumerable<Type> TypeParameters { get; }
+
+        public abstract IEnumerable<Type> MethodParameters { get; }
+
+        public Context Cx { get; }
     }
 }

csharp/extractor/Semmle.Extraction.CIL/Entities/ITypeSignature.cs

@@ -4,6 +4,6 @@ namespace Semmle.Extraction.CIL.Entities
 {
     internal interface ITypeSignature
     {
-        void WriteId(TextWriter trapFile, GenericContext gc);
+        void WriteId(TextWriter trapFile, IGenericContext gc);
     }
 }

csharp/extractor/Semmle.Extraction.CIL/Entities/MemberReferenceField.cs

@@ -8,10 +8,10 @@ internal sealed class MemberReferenceField : Field
     {
         private readonly MemberReferenceHandle handle;
         private readonly MemberReference mr;
-        private readonly GenericContext gc;
+        private readonly IGenericContext gc;
         private readonly Type declType;
 
-        public MemberReferenceField(GenericContext gc, MemberReferenceHandle handle) : base(gc.Cx)
+        public MemberReferenceField(IGenericContext gc, MemberReferenceHandle handle) : base(gc.Cx)
         {
             this.handle = handle;
             this.gc = gc;

csharp/extractor/Semmle.Extraction.CIL/Entities/MemberReferenceMethod.cs

@@ -12,18 +12,18 @@ internal sealed class MemberReferenceMethod : Method
         private readonly MemberReferenceHandle handle;
         private readonly MemberReference mr;
         private readonly Type declaringType;
-        private readonly GenericContext parent;
+        private readonly IGenericContext parent;
         private readonly Method? sourceDeclaration;
 
-        public MemberReferenceMethod(GenericContext gc, MemberReferenceHandle handle) : base(gc)
+        public MemberReferenceMethod(IGenericContext gc, MemberReferenceHandle handle) : base(gc)
         {
             this.handle = handle;
             this.gc = gc;
             mr = Cx.MdReader.GetMemberReference(handle);
 
             signature = mr.DecodeMethodSignature(new SignatureDecoder(), gc);
 
-            parent = (GenericContext)Cx.CreateGeneric(gc, mr.Parent);
+            parent = (IGenericContext)Cx.CreateGeneric(gc, mr.Parent);
 
             var declType = parent is Method parentMethod
                 ? parentMethod.DeclaringType

csharp/extractor/Semmle.Extraction.CIL/Entities/Method.cs

@@ -12,10 +12,10 @@ namespace Semmle.Extraction.CIL.Entities
     internal abstract class Method : TypeContainer, IMember, ICustomModifierReceiver, IParameterizable
     {
         protected MethodTypeParameter[]? genericParams;
-        protected GenericContext gc;
+        protected IGenericContext gc;
         protected MethodSignature<ITypeSignature> signature;
 
-        protected Method(GenericContext gc) : base(gc.Cx)
+        protected Method(IGenericContext gc) : base(gc.Cx)
         {
             this.gc = gc;
         }