hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-16 16:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

C#: Avoid extracting duplicate type locations.

Browse Source
This commit is contained in:
Michael Nebel
2025-09-30 15:52:47 +02:00
parent f2b45b8726
commit 0cd7c37209
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,15 +111,18 @@ namespace Semmle.Extraction.CSharp.Entities
}
}
private static IEnumerable<Microsoft.CodeAnalysis.Location> GetLocations(INamedTypeSymbol type)
private IEnumerable<Microsoft.CodeAnalysis.Location> GetLocations(INamedTypeSymbol type)
{
return type.Locations
.Where(l => l.IsInMetadata)
.Concat(type.DeclaringSyntaxReferences
var metadataLocations = type.Locations
.Where(l => l.IsInMetadata);
var sourceLocations = type.DeclaringSyntaxReferences
.Select(loc => loc.GetSyntax())
.OfType<CSharpSyntaxNode>()
.Select(l => l.FixedLocation())
);
.Where(Context.IsLocationInContext);
return metadataLocations
.Concat(sourceLocations);
}
public override Microsoft.CodeAnalysis.Location? ReportingLocation => GetLocations(Symbol).BestOrDefault();

7
csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/TypeParameter.cs
View File

@@ -26,9 +26,12 @@ namespace Semmle.Extraction.CSharp.Entities
var parentNs = Namespace.Create(Context, Symbol.TypeParameterKind == TypeParameterKind.Method ? Context.Compilation.GlobalNamespace : Symbol.ContainingNamespace);
trapFile.parent_namespace(this, parentNs);
foreach (var l in Symbol.Locations)
if (Context.ExtractLocation(Symbol))
{
WriteLocationToTrap(trapFile.type_location, this, Context.CreateLocation(l));
foreach (var l in Symbol.Locations)
{
WriteLocationToTrap(trapFile.type_location, this, Context.CreateLocation(l));
}
}
if (IsSourceDeclaration)

3
csharp/extractor/Semmle.Extraction.CSharp/Extractor/Context.cs
View File

@@ -554,6 +554,9 @@ namespace Semmle.Extraction.CSharp
SymbolEqualityComparer.Default.Equals(symbol, symbol.OriginalDefinition) &&
scope.InScope(symbol);
public bool IsLocationInContext(Location location) =>
location.SourceTree == SourceTree;
/// <summary>
/// Runs the given action <paramref name="a"/>, guarding for trap duplication
/// based on key <paramref name="key"/>.