Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use ImmutableSegmentedDictionary for faster lookup in AnalyzerDriver #51535

Merged
merged 1 commit into from
Mar 2, 2021
Merged

Use ImmutableSegmentedDictionary for faster lookup in AnalyzerDriver #51535

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerDriver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Collections;
using Microsoft.CodeAnalysis.Diagnostics.Telemetry;
using Microsoft.CodeAnalysis.Operations;
using Microsoft.CodeAnalysis.PooledObjects;
Expand Down Expand Up @@ -158,16 +159,16 @@ private ImmutableDictionary<DiagnosticAnalyzer, SemaphoreSlim> AnalyzerGateMap
}
}

private ImmutableDictionary<DiagnosticAnalyzer, GeneratedCodeAnalysisFlags>? _lazyGeneratedCodeAnalysisFlagsMap;
private ImmutableSegmentedDictionary<DiagnosticAnalyzer, GeneratedCodeAnalysisFlags> _lazyGeneratedCodeAnalysisFlagsMap;

/// <summary>
/// Map from analyzers to their <see cref="GeneratedCodeAnalysisFlags"/> setting.
/// </summary>
private ImmutableDictionary<DiagnosticAnalyzer, GeneratedCodeAnalysisFlags> GeneratedCodeAnalysisFlagsMap
private ImmutableSegmentedDictionary<DiagnosticAnalyzer, GeneratedCodeAnalysisFlags> GeneratedCodeAnalysisFlagsMap
{
get
{
Debug.Assert(_lazyGeneratedCodeAnalysisFlagsMap != null);
Debug.Assert(!_lazyGeneratedCodeAnalysisFlagsMap.IsDefault);
return _lazyGeneratedCodeAnalysisFlagsMap;
}
}
Expand Down Expand Up @@ -532,7 +533,7 @@ private ImmutableHashSet<DiagnosticAnalyzer> ComputeSymbolStartAnalyzers(Immutab

private static bool ComputeShouldSkipAnalysisOnGeneratedCode(
ImmutableHashSet<DiagnosticAnalyzer> analyzers,
ImmutableDictionary<DiagnosticAnalyzer, GeneratedCodeAnalysisFlags> generatedCodeAnalysisFlagsMap,
ImmutableSegmentedDictionary<DiagnosticAnalyzer, GeneratedCodeAnalysisFlags> generatedCodeAnalysisFlagsMap,
bool treatAllCodeAsNonGeneratedCode)
{
foreach (var analyzer in analyzers)
Expand All @@ -549,7 +550,7 @@ private static bool ComputeShouldSkipAnalysisOnGeneratedCode(
/// <summary>
/// Returns true if all analyzers need to analyze and report diagnostics in generated code - we can assume all code to be non-generated code.
/// </summary>
private static bool ComputeShouldTreatAllCodeAsNonGeneratedCode(ImmutableHashSet<DiagnosticAnalyzer> analyzers, ImmutableDictionary<DiagnosticAnalyzer, GeneratedCodeAnalysisFlags> generatedCodeAnalysisFlagsMap)
private static bool ComputeShouldTreatAllCodeAsNonGeneratedCode(ImmutableHashSet<DiagnosticAnalyzer> analyzers, ImmutableSegmentedDictionary<DiagnosticAnalyzer, GeneratedCodeAnalysisFlags> generatedCodeAnalysisFlagsMap)
{
foreach (var analyzer in analyzers)
{
Expand All @@ -570,7 +571,7 @@ private bool ShouldSkipAnalysisOnGeneratedCode(DiagnosticAnalyzer analyzer)

private static bool ShouldSkipAnalysisOnGeneratedCode(
DiagnosticAnalyzer analyzer,
ImmutableDictionary<DiagnosticAnalyzer, GeneratedCodeAnalysisFlags> generatedCodeAnalysisFlagsMap,
ImmutableSegmentedDictionary<DiagnosticAnalyzer, GeneratedCodeAnalysisFlags> generatedCodeAnalysisFlagsMap,
bool treatAllCodeAsNonGeneratedCode)
{
if (treatAllCodeAsNonGeneratedCode)
Expand Down Expand Up @@ -2163,13 +2164,13 @@ private static async Task<ImmutableDictionary<DiagnosticAnalyzer, SemaphoreSlim>
return builder.ToImmutable();
}

private static async Task<ImmutableDictionary<DiagnosticAnalyzer, GeneratedCodeAnalysisFlags>> CreateGeneratedCodeAnalysisFlagsMapAsync(
private static async Task<ImmutableSegmentedDictionary<DiagnosticAnalyzer, GeneratedCodeAnalysisFlags>> CreateGeneratedCodeAnalysisFlagsMapAsync(
ImmutableHashSet<DiagnosticAnalyzer> analyzers,
AnalyzerManager analyzerManager,
AnalyzerExecutor analyzerExecutor,
SeverityFilter severityFilter)
{
var builder = ImmutableDictionary.CreateBuilder<DiagnosticAnalyzer, GeneratedCodeAnalysisFlags>();
var builder = ImmutableSegmentedDictionary.CreateBuilder<DiagnosticAnalyzer, GeneratedCodeAnalysisFlags>();
foreach (var analyzer in analyzers)
{
Debug.Assert(!IsDiagnosticAnalyzerSuppressed(analyzer, analyzerExecutor.Compilation.Options, analyzerManager, analyzerExecutor, severityFilter));
Expand Down