hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-05 05:35:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

C#: Remove marker interfaces from CIL extraction

Browse Source
This commit is contained in:
Tamas Vajk
2020-12-01 15:17:25 +01:00
parent df28544020
commit 9ab930f812
49 changed files with 97 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
csharp/extractor/Semmle.Extraction.CIL/Entities/ArrayType.cs
View File

@@ -7,7 +7,7 @@ namespace Semmle.Extraction.CIL.Entities
/// <summary>
/// An array type.
/// </summary>
internal sealed class ArrayType : Type, IArrayType
internal sealed class ArrayType : Type
{
private readonly Type elementType;
private readonly int rank;

2
csharp/extractor/Semmle.Extraction.CIL/Entities/Assembly.cs
View File

@@ -12,7 +12,7 @@ namespace Semmle.Extraction.CIL.Entities
/// <summary>
/// An assembly to extract.
/// </summary>
public class Assembly : LabelledEntity, IAssembly
public class Assembly : LabelledEntity, ILocation
{
private readonly File file;
private readonly AssemblyName assemblyName;

2
csharp/extractor/Semmle.Extraction.CIL/Entities/Attribute.cs
View File

@@ -7,7 +7,7 @@ namespace Semmle.Extraction.CIL.Entities
/// <summary>
/// Entity representing a CIL attribute.
/// </summary>
internal sealed class Attribute : UnlabelledEntity, IAttribute
internal sealed class Attribute : UnlabelledEntity
{
private readonly CustomAttributeHandle handle;
private readonly CustomAttribute attrib;

8
csharp/extractor/Semmle.Extraction.CIL/Entities/DefinitionMethod.cs
View File

@@ -9,11 +9,11 @@ namespace Semmle.Extraction.CIL.Entities
/// <summary>
/// A definition method - a method defined in the current assembly.
/// </summary>
internal sealed class DefinitionMethod : Method, IMember
internal sealed class DefinitionMethod : Method
{
private readonly Handle handle;
private readonly MethodDefinition md;
private readonly PDB.IMethod? methodDebugInformation;
private readonly PDB.Method? methodDebugInformation;
private readonly Type declaringType;
private readonly string name;
@@ -120,7 +120,7 @@ namespace Semmle.Extraction.CIL.Entities
}
}
var jump_table = new Dictionary<int, IInstruction>();
var jump_table = new Dictionary<int, Instruction>();
foreach (var c in Decode(body.GetILBytes(), jump_table))
yield return c;
@@ -178,7 +178,7 @@ namespace Semmle.Extraction.CIL.Entities
}
}
private IEnumerable<IExtractionProduct> Decode(byte[] ilbytes, Dictionary<int, IInstruction> jump_table)
private IEnumerable<IExtractionProduct> Decode(byte[] ilbytes, Dictionary<int, Instruction> jump_table)
{
// Sequence points are stored in order of offset.
// We use an enumerator to locate the correct sequence point for each instruction.

2
csharp/extractor/Semmle.Extraction.CIL/Entities/Event.cs
View File

@@ -7,7 +7,7 @@ namespace Semmle.Extraction.CIL.Entities
/// <summary>
/// An event entity.
/// </summary>
internal sealed class Event : LabelledEntity, IEvent
internal sealed class Event : LabelledEntity
{
private readonly EventDefinitionHandle handle;
private readonly Type parent;

6
csharp/extractor/Semmle.Extraction.CIL/Entities/ExceptionRegion.cs
View File

@@ -5,15 +5,15 @@ namespace Semmle.Extraction.CIL.Entities
/// <summary>
/// An exception region entity.
/// </summary>
internal class ExceptionRegion : UnlabelledEntity, IExceptionRegion
internal class ExceptionRegion : UnlabelledEntity
{
private readonly GenericContext gc;
private readonly MethodImplementation method;
private readonly int index;
private readonly System.Reflection.Metadata.ExceptionRegion r;
private readonly Dictionary<int, IInstruction> jump_table;
private readonly Dictionary<int, Instruction> jump_table;
public ExceptionRegion(GenericContext gc, MethodImplementation method, int index, System.Reflection.Metadata.ExceptionRegion r, Dictionary<int, IInstruction> jump_table) : base(gc.Cx)
public ExceptionRegion(GenericContext gc, MethodImplementation method, int index, System.Reflection.Metadata.ExceptionRegion r, Dictionary<int, Instruction> jump_table) : base(gc.Cx)
{
this.gc = gc;
this.method = method;

2
csharp/extractor/Semmle.Extraction.CIL/Entities/Field.cs
View File

@@ -8,7 +8,7 @@ namespace Semmle.Extraction.CIL.Entities
/// <summary>
/// An entity representing a field.
/// </summary>
internal abstract class Field : GenericContext, IField
internal abstract class Field : GenericContext, IMember
{
protected Field(Context cx) : base(cx)
{

2
csharp/extractor/Semmle.Extraction.CIL/Entities/File.cs
View File

@@ -3,7 +3,7 @@ using System.IO;
namespace Semmle.Extraction.CIL.Entities
{
public class File : LabelledEntity, IFile
public class File : LabelledEntity, IFileOrFolder
{
protected string OriginalPath { get; }
protected PathTransformer.ITransformedPath TransformedPath { get; }

2
csharp/extractor/Semmle.Extraction.CIL/Entities/Folder.cs
View File

@@ -3,7 +3,7 @@ using System.IO;
namespace Semmle.Extraction.CIL.Entities
{
public sealed class Folder : LabelledEntity, IFolder
public sealed class Folder : LabelledEntity, IFileOrFolder
{
private readonly PathTransformer.ITransformedPath transformedPath;

9
csharp/extractor/Semmle.Extraction.CIL/Entities/IArrayType.cs
View File

@@ -1,9 +0,0 @@
namespace Semmle.Extraction.CIL.Entities
{
/// <summary>
/// An array type.
/// </summary>
internal interface IArrayType : IType
{
}
}

6
csharp/extractor/Semmle.Extraction.CIL/Entities/IAssembly.cs
View File

@@ -1,6 +0,0 @@
namespace Semmle.Extraction.CIL.Entities
{
internal interface IAssembly : ILocation
{
}
}

9
csharp/extractor/Semmle.Extraction.CIL/Entities/IAttribute.cs
View File

@@ -1,9 +0,0 @@
namespace Semmle.Extraction.CIL.Entities
{
/// <summary>
/// A CIL attribute.
/// </summary>
internal interface IAttribute : IExtractedEntity
{
}
}

9
csharp/extractor/Semmle.Extraction.CIL/Entities/IEvent.cs
View File

@@ -1,9 +0,0 @@
namespace Semmle.Extraction.CIL.Entities
{
/// <summary>
/// An event.
/// </summary>
internal interface IEvent : IExtractedEntity
{
}
}

6
csharp/extractor/Semmle.Extraction.CIL/Entities/IExceptionRegion.cs
View File

@@ -1,6 +0,0 @@
namespace Semmle.Extraction.CIL.Entities
{
internal interface IExceptionRegion : IExtractedEntity
{
}
}

9
csharp/extractor/Semmle.Extraction.CIL/Entities/IField.cs
View File

@@ -1,9 +0,0 @@
namespace Semmle.Extraction.CIL.Entities
{
/// <summary>
/// An entity representing a field.
/// </summary>
internal interface IField : IMember
{
}
}

6
csharp/extractor/Semmle.Extraction.CIL/Entities/IFile.cs
View File

@@ -1,6 +0,0 @@
namespace Semmle.Extraction.CIL.Entities
{
internal interface IFile : IFileOrFolder
{
}
}

6
csharp/extractor/Semmle.Extraction.CIL/Entities/IFolder.cs
View File

@@ -1,6 +0,0 @@
namespace Semmle.Extraction.CIL.Entities
{
internal interface IFolder : IFileOrFolder
{
}
}

17
csharp/extractor/Semmle.Extraction.CIL/Entities/IInstruction.cs
View File

@@ -1,17 +0,0 @@
using System.Collections.Generic;
namespace Semmle.Extraction.CIL.Entities
{
/// <summary>
/// A CIL instruction.
/// </summary>
internal interface IInstruction : IExtractedEntity
{
/// <summary>
/// Gets the extraction products for branches.
/// </summary>
/// <param name="jump_table">The map from offset to instruction.</param>
/// <returns>The extraction products.</returns>
IEnumerable<IExtractionProduct> JumpContents(Dictionary<int, IInstruction> jump_table);
}
}

6
csharp/extractor/Semmle.Extraction.CIL/Entities/ILocal.cs
View File

@@ -1,6 +0,0 @@
namespace Semmle.Extraction.CIL.Entities
{
internal interface ILocal : IExtractedEntity
{
}
}

9
csharp/extractor/Semmle.Extraction.CIL/Entities/IMethod.cs
View File

@@ -1,9 +0,0 @@
namespace Semmle.Extraction.CIL.Entities
{
/// <summary>
/// A method entity.
/// </summary>
internal interface IMethod : IMember
{
}
}

9
csharp/extractor/Semmle.Extraction.CIL/Entities/IMethodImplementation.cs
View File

@@ -1,9 +0,0 @@
namespace Semmle.Extraction.CIL.Entities
{
/// <summary>
/// A method implementation entity.
/// </summary>
internal interface IMethodImplementation : IExtractedEntity
{
}
}

9
csharp/extractor/Semmle.Extraction.CIL/Entities/INamespace.cs
View File

@@ -1,9 +0,0 @@
namespace Semmle.Extraction.CIL.Entities
{
/// <summary>
/// A namespace.
/// </summary>
internal interface INamespace : ITypeContainer
{
}
}

9
csharp/extractor/Semmle.Extraction.CIL/Entities/IParameter.cs
View File

@@ -1,9 +0,0 @@
namespace Semmle.Extraction.CIL.Entities
{
/// <summary>
/// A parameter entity.
/// </summary>
internal interface IParameter : IExtractedEntity
{
}
}

6
csharp/extractor/Semmle.Extraction.CIL/Entities/IPointerType.cs
View File

@@ -1,6 +0,0 @@
namespace Semmle.Extraction.CIL.Entities
{
internal interface IPointerType : IType
{
}
}

9
csharp/extractor/Semmle.Extraction.CIL/Entities/IProperty.cs
View File

@@ -1,9 +0,0 @@
namespace Semmle.Extraction.CIL.Entities
{
/// <summary>
/// A property.
/// </summary>
internal interface IProperty : IExtractedEntity
{
}
}

6
csharp/extractor/Semmle.Extraction.CIL/Entities/ISourceLocation.cs
View File

@@ -1,6 +0,0 @@
namespace Semmle.Extraction.CIL.Entities
{
public interface ISourceLocation : ILocation
{
}
}

9
csharp/extractor/Semmle.Extraction.CIL/Entities/IType.cs
View File

@@ -1,9 +0,0 @@
namespace Semmle.Extraction.CIL.Entities
{
/// <summary>
/// A type.
/// </summary>
internal interface IType : IEntity
{
}
}

9
csharp/extractor/Semmle.Extraction.CIL/Entities/ITypeContainer.cs
View File

@@ -1,9 +0,0 @@
namespace Semmle.Extraction.CIL.Entities
{
/// <summary>
/// A type container (namespace/types/method).
/// </summary>
internal interface ITypeContainer : IExtractedEntity
{
}
}

6
csharp/extractor/Semmle.Extraction.CIL/Entities/ITypeParameter.cs
View File

@@ -1,6 +0,0 @@
namespace Semmle.Extraction.CIL.Entities
{
internal interface ITypeParameter : IType
{
}
}

6
csharp/extractor/Semmle.Extraction.CIL/Entities/Instruction.cs
View File

@@ -8,7 +8,7 @@ namespace Semmle.Extraction.CIL.Entities
/// <summary>
/// A CIL instruction.
/// </summary>
internal class Instruction : UnlabelledEntity, IInstruction
internal class Instruction : UnlabelledEntity, IEntity
{
/// <summary>
/// The additional data following the opcode, if any.
@@ -433,10 +433,10 @@ namespace Semmle.Extraction.CIL.Entities
}
// Called to populate the jumps in each instruction.
public IEnumerable<IExtractionProduct> JumpContents(Dictionary<int, IInstruction> jump_table)
public IEnumerable<IExtractionProduct> JumpContents(Dictionary<int, Instruction> jump_table)
{
int target;
IInstruction? inst;
Instruction? inst;
switch (PayloadType)
{

2
csharp/extractor/Semmle.Extraction.CIL/Entities/LocalVariable.cs
View File

@@ -3,7 +3,7 @@ using System.IO;
namespace Semmle.Extraction.CIL.Entities
{
internal class LocalVariable : LabelledEntity, ILocal
internal class LocalVariable : LabelledEntity
{
private readonly MethodImplementation method;
private readonly int index;

2
csharp/extractor/Semmle.Extraction.CIL/Entities/Method.cs
View File

@@ -10,7 +10,7 @@ namespace Semmle.Extraction.CIL.Entities
/// <summary>
/// A method entity.
/// </summary>
internal abstract class Method : TypeContainer, IMethod
internal abstract class Method : TypeContainer, IMember
{
protected MethodTypeParameter[]? genericParams;
protected GenericContext gc;

2
csharp/extractor/Semmle.Extraction.CIL/Entities/MethodImplementation.cs
View File

@@ -6,7 +6,7 @@ namespace Semmle.Extraction.CIL.Entities
/// A method implementation entity.
/// In the database, the same method could in principle have multiple implementations.
/// </summary>
internal class MethodImplementation : UnlabelledEntity, IMethodImplementation
internal class MethodImplementation : UnlabelledEntity
{
private readonly Method m;

2
csharp/extractor/Semmle.Extraction.CIL/Entities/Namespace.cs
View File

@@ -7,7 +7,7 @@ namespace Semmle.Extraction.CIL.Entities
/// <summary>
/// A namespace.
/// </summary>
public sealed class Namespace : TypeContainer, INamespace
public sealed class Namespace : TypeContainer
{
public Namespace? ParentNamespace { get; }
public string Name { get; }

2
csharp/extractor/Semmle.Extraction.CIL/Entities/Parameter.cs
View File

@@ -6,7 +6,7 @@ namespace Semmle.Extraction.CIL.Entities
/// <summary>
/// A parameter entity.
/// </summary>
internal sealed class Parameter : LabelledEntity, IParameter
internal sealed class Parameter : LabelledEntity
{
private readonly Method method;
private readonly int index;

2
csharp/extractor/Semmle.Extraction.CIL/Entities/PointerType.cs
View File

@@ -4,7 +4,7 @@ using System.IO;
namespace Semmle.Extraction.CIL.Entities
{
internal sealed class PointerType : Type, IPointerType
internal sealed class PointerType : Type
{
private readonly Type pointee;

2
csharp/extractor/Semmle.Extraction.CIL/Entities/Property.cs
View File

@@ -8,7 +8,7 @@ namespace Semmle.Extraction.CIL.Entities
/// <summary>
/// A property.
/// </summary>
internal sealed class Property : LabelledEntity, IProperty
internal sealed class Property : LabelledEntity
{
private readonly Handle handle;
private readonly Type type;

2
csharp/extractor/Semmle.Extraction.CIL/Entities/SourceLocation.cs
View File

@@ -4,7 +4,7 @@ using Semmle.Extraction.PDB;
namespace Semmle.Extraction.CIL.Entities
{
public sealed class PdbSourceLocation : LabelledEntity, ISourceLocation
public sealed class PdbSourceLocation : LabelledEntity, ILocation
{
private readonly Location location;
private readonly PdbSourceFile file;

2
csharp/extractor/Semmle.Extraction.CIL/Entities/Type.cs
View File

@@ -9,7 +9,7 @@ namespace Semmle.Extraction.CIL.Entities
/// <summary>
/// A type.
/// </summary>
public abstract class Type : TypeContainer, IMember, IType
public abstract class Type : TypeContainer, IMember
{
public override string IdSuffix => ";cil-type";

2
csharp/extractor/Semmle.Extraction.CIL/Entities/TypeContainer.cs
View File

@@ -8,7 +8,7 @@ namespace Semmle.Extraction.CIL.Entities
/// <summary>
/// Base class for all type containers (namespaces, types, methods).
/// </summary>
public abstract class TypeContainer : GenericContext, ITypeContainer
public abstract class TypeContainer : GenericContext, IExtractedEntity
{
protected TypeContainer(Context cx) : base(cx)
{

2
csharp/extractor/Semmle.Extraction.CIL/Entities/TypeParameter.cs
View File

@@ -7,7 +7,7 @@ using System.IO;
namespace Semmle.Extraction.CIL.Entities
{
internal abstract class TypeParameter : Type, ITypeParameter
internal abstract class TypeParameter : Type
{
protected readonly GenericContext gc;