hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-27 17:55:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

C#: Adjust caching of tuple types

Browse Source
This commit is contained in:
Tom Hvitved
2020-09-14 11:24:46 +02:00
parent 19746023d9
commit 0fb9dc5bac
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/NamedType.cs
View File

@@ -19,9 +19,7 @@ namespace Semmle.Extraction.CSharp.Entities
}
public static NamedType Create(Context cx, INamedTypeSymbol type) =>
type.IsTupleType
? NamedTupleTypeFactory.Instance.CreateEntity(cx, (type, false), (type, false))
: NamedTypeFactory.Instance.CreateEntityFromSymbol(cx, type);
NamedTypeFactory.Instance.CreateEntityFromSymbol(cx, type);
/// <summary>
/// Creates a named type entity from a tuple type. Unlike `Create`, this
@@ -30,7 +28,7 @@ namespace Semmle.Extraction.CSharp.Entities
/// `System.ValueTuple<int, string>`.
/// </summary>
public static NamedType CreateNamedTypeFromTupleType(Context cx, INamedTypeSymbol type) =>
NamedTupleTypeFactory.Instance.CreateEntity(cx, (type, true), (type, true));
UnderlyingTupleTypeFactory.Instance.CreateEntity(cx, (new SymbolEqualityWrapper(type), typeof(TupleType)), type);
public override bool NeedsPopulation => base.NeedsPopulation || symbol.TypeKind == TypeKind.Error;
@@ -182,11 +180,11 @@ namespace Semmle.Extraction.CSharp.Entities
public NamedType Create(Context cx, INamedTypeSymbol init) => new NamedType(cx, init, false);
}
class NamedTupleTypeFactory : ICachedEntityFactory<(INamedTypeSymbol, bool), NamedType>
class UnderlyingTupleTypeFactory : ICachedEntityFactory<INamedTypeSymbol, NamedType>
{
public static readonly NamedTupleTypeFactory Instance = new NamedTupleTypeFactory();
public static readonly UnderlyingTupleTypeFactory Instance = new UnderlyingTupleTypeFactory();
public NamedType Create(Context cx, (INamedTypeSymbol, bool) init) => new NamedType(cx, init.Item1, init.Item2);
public NamedType Create(Context cx, INamedTypeSymbol init) => new NamedType(cx, init, true);
}
// Do not create typerefs of constructed generics as they are always in the current trap file.