Skip to content

Commit fc39c64

Browse files
committed
C#: Rename GeneratedLocation to EmptyLocation and make sure that we always create one such location.
1 parent 26aa938 commit fc39c64

File tree

3 files changed

+18
-9
lines changed

3 files changed

+18
-9
lines changed

csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/GeneratedLocation.cs renamed to csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/EmptyLocation.cs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
using System.IO;
2+
using System.Threading;
23

34
namespace Semmle.Extraction.CSharp.Entities
45
{
5-
public class GeneratedLocation : SourceLocation
6+
public class EmptyLocation : SourceLocation
67
{
78
private readonly File generatedFile;
89

9-
private GeneratedLocation(Context cx)
10+
private EmptyLocation(Context cx)
1011
: base(cx, null)
1112
{
1213
generatedFile = GeneratedFile.Create(cx);
@@ -26,15 +27,16 @@ public override void WriteId(EscapingTextWriter trapFile)
2627

2728
public override int GetHashCode() => 98732567;
2829

29-
public override bool Equals(object? obj) => obj is not null && obj.GetType() == typeof(GeneratedLocation);
30+
public override bool Equals(object? obj) => obj is not null && obj.GetType() == typeof(EmptyLocation);
3031

31-
public static GeneratedLocation Create(Context cx) => GeneratedLocationFactory.Instance.CreateEntity(cx, typeof(GeneratedLocation), null);
32+
public static EmptyLocation Create(Context cx)
33+
=> EmptyLocationFactory.Instance.CreateEntity(cx, typeof(EmptyLocation), null);
3234

33-
private class GeneratedLocationFactory : CachedEntityFactory<string?, GeneratedLocation>
35+
private class EmptyLocationFactory : CachedEntityFactory<string?, EmptyLocation>
3436
{
35-
public static GeneratedLocationFactory Instance { get; } = new GeneratedLocationFactory();
37+
public static EmptyLocationFactory Instance { get; } = new EmptyLocationFactory();
3638

37-
public override GeneratedLocation Create(Context cx, string? init) => new GeneratedLocation(cx);
39+
public override EmptyLocation Create(Context cx, string? init) => new EmptyLocation(cx);
3840
}
3941
}
4042
}

csharp/extractor/Semmle.Extraction.CSharp/Extractor/Analyser.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,9 @@ private void DoAnalyseCompilation()
238238

239239
compilationEntity = Entities.Compilation.Create(cx);
240240

241+
// Ensure that the empty location is always created.
242+
Entities.EmptyLocation.Create(cx);
243+
241244
ExtractionContext.CompilationInfos.ForEach(ci => trapWriter.Writer.compilation_info(compilationEntity, ci.key, ci.value));
242245

243246
ReportProgressTaskDone(currentTaskId, assemblyPath, trapWriter.TrapFile, stopwatch.Elapsed, AnalysisAction.Extracted);

csharp/extractor/Semmle.Extraction.CSharp/Extractor/Context.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,10 @@ public bool Defines(ISymbol symbol) =>
550550
!SymbolEqualityComparer.Default.Equals(symbol, symbol.OriginalDefinition) ||
551551
scope.InScope(symbol);
552552

553+
public bool ExtractLocation(ISymbol symbol) =>
554+
SymbolEqualityComparer.Default.Equals(symbol, symbol.OriginalDefinition) &&
555+
scope.InScope(symbol);
556+
553557
/// <summary>
554558
/// Runs the given action <paramref name="a"/>, guarding for trap duplication
555559
/// based on key <paramref name="key"/>.
@@ -582,14 +586,14 @@ public void WithDuplicationGuard(Key key, Action a)
582586
public Entities.Location CreateLocation()
583587
{
584588
return SourceTree is null
585-
? Entities.GeneratedLocation.Create(this)
589+
? Entities.EmptyLocation.Create(this)
586590
: CreateLocation(Microsoft.CodeAnalysis.Location.Create(SourceTree, Microsoft.CodeAnalysis.Text.TextSpan.FromBounds(0, 0)));
587591
}
588592

589593
public Entities.Location CreateLocation(Microsoft.CodeAnalysis.Location? location)
590594
{
591595
return (location is null || location.Kind == LocationKind.None)
592-
? Entities.GeneratedLocation.Create(this)
596+
? Entities.EmptyLocation.Create(this)
593597
: location.IsInSource
594598
? Entities.NonGeneratedSourceLocation.Create(this, location)
595599
: Entities.Assembly.Create(this, location);

0 commit comments

Comments
 (0)