Skip to content

Cache lambdas in analyzer driver #80759

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

Merged
merged 2 commits into from
Oct 24, 2025
Merged

Cache lambdas in analyzer driver #80759

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6c879d
Cache lambdas in analyzer driver
CyrusNajmabadi Oct 16, 2025
9700de3
Simplify
CyrusNajmabadi Oct 16, 2025
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
104 changes: 45 additions & 59 deletions src/Compilers/Core/Portable/DiagnosticAnalyzer/AnalyzerExecutor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,10 +458,17 @@ public void ExecuteSymbolActions(

var symbol = symbolDeclaredEvent.Symbol;
var analyzerOptions = this.GetAnalyzerSpecificOptions(analyzer);
var addDiagnostic = GetAddDiagnostic(
symbol, symbolDeclaredEvent.DeclaringSyntaxReferences, analyzer, analyzerOptions, getTopMostNodeForAnalysis, cancellationToken);

using var _ = PooledDelegates.GetPooledFunction(
using var _1 = PooledDelegates.GetPooledAction(
static (diagnostic, tuple) =>
{
var (self, analyzer, symbolDeclaredEvent, analyzerOptions, getTopMostNodeForAnalysis, cancellationToken) = tuple;
tuple.self.AddSymbolDiagnostic(symbolDeclaredEvent, diagnostic, analyzer, analyzerOptions, getTopMostNodeForAnalysis, cancellationToken);
},
(self: this, analyzer, symbolDeclaredEvent, analyzerOptions, getTopMostNodeForAnalysis, cancellationToken),
out Action<Diagnostic> addDiagnostic);

using var _2 = PooledDelegates.GetPooledFunction(
static (d, ct, arg) => arg.self.IsSupportedDiagnostic(arg.analyzer, d, ct),
(self: this, analyzer),
out Func<Diagnostic, CancellationToken, bool> isSupportedDiagnostic);
Expand Down Expand Up @@ -570,9 +577,17 @@ private void ExecuteSymbolEndActionsCore(

var symbol = symbolDeclaredEvent.Symbol;
var analyzerOptions = this.GetAnalyzerSpecificOptions(analyzer);
var addDiagnostic = GetAddDiagnostic(symbol, symbolDeclaredEvent.DeclaringSyntaxReferences, analyzer, analyzerOptions, getTopMostNodeForAnalysis, cancellationToken);

using var _ = PooledDelegates.GetPooledFunction(
using var _1 = PooledDelegates.GetPooledAction(
static (diagnostic, tuple) =>
{
var (self, analyzer, symbolDeclaredEvent, analyzerOptions, getTopMostNodeForAnalysis, cancellationToken) = tuple;
tuple.self.AddSymbolDiagnostic(symbolDeclaredEvent, diagnostic, analyzer, analyzerOptions, getTopMostNodeForAnalysis, cancellationToken);
},
(self: this, analyzer, symbolDeclaredEvent, analyzerOptions, getTopMostNodeForAnalysis, cancellationToken),
out Action<Diagnostic> addDiagnostic);

using var _2 = PooledDelegates.GetPooledFunction(
static (d, ct, arg) => arg.self.IsSupportedDiagnostic(arg.analyzer, d, ct),
(self: this, analyzer),
out Func<Diagnostic, CancellationToken, bool> isSupportedDiagnostic);
Expand Down Expand Up @@ -1507,76 +1522,47 @@ private bool IsSupportedDiagnostic(DiagnosticAnalyzer analyzer, Diagnostic diagn
return _analyzerManager.IsSupportedDiagnostic(analyzer, diagnostic, _isCompilerAnalyzer, this, cancellationToken);
}

private Action<Diagnostic> GetAddDiagnostic(
ISymbol contextSymbol,
ImmutableArray<SyntaxReference> cachedDeclaringReferences,
private void AddSymbolDiagnostic(
SymbolDeclaredCompilationEvent symbolDeclaredEvent,
Diagnostic diagnostic,
DiagnosticAnalyzer analyzer,
AnalyzerOptions options,
Func<ISymbol, SyntaxReference, Compilation, CancellationToken, SyntaxNode> getTopMostNodeForAnalysis,
CancellationToken cancellationToken)
{
return GetAddDiagnostic(
contextSymbol,
cachedDeclaringReferences,
Compilation,
analyzer,
options,
_addNonCategorizedDiagnostic,
_addCategorizedLocalDiagnostic,
_addCategorizedNonLocalDiagnostic,
getTopMostNodeForAnalysis,
_shouldSuppressGeneratedCodeDiagnostic,
cancellationToken);
}

private static Action<Diagnostic> GetAddDiagnostic(
ISymbol contextSymbol,
ImmutableArray<SyntaxReference> cachedDeclaringReferences,
Compilation compilation,
DiagnosticAnalyzer analyzer,
AnalyzerOptions options,
Action<Diagnostic, AnalyzerOptions, CancellationToken>? addNonCategorizedDiagnostic,
Action<Diagnostic, DiagnosticAnalyzer, AnalyzerOptions, bool, CancellationToken>? addCategorizedLocalDiagnostic,
Action<Diagnostic, DiagnosticAnalyzer, AnalyzerOptions, CancellationToken>? addCategorizedNonLocalDiagnostic,
Func<ISymbol, SyntaxReference, Compilation, CancellationToken, SyntaxNode> getTopMostNodeForAnalysis,
Func<Diagnostic, DiagnosticAnalyzer, Compilation, CancellationToken, bool> shouldSuppressGeneratedCodeDiagnostic,
CancellationToken cancellationToken)
{
return diagnostic =>
if (_shouldSuppressGeneratedCodeDiagnostic(diagnostic, analyzer, this.Compilation, cancellationToken))
{
if (shouldSuppressGeneratedCodeDiagnostic(diagnostic, analyzer, compilation, cancellationToken))
{
return;
}
return;
}

if (addCategorizedLocalDiagnostic == null)
{
Debug.Assert(addNonCategorizedDiagnostic != null);
addNonCategorizedDiagnostic(diagnostic, options, cancellationToken);
return;
}
if (_addCategorizedLocalDiagnostic == null)
{
Debug.Assert(_addNonCategorizedDiagnostic != null);
_addNonCategorizedDiagnostic(diagnostic, options, cancellationToken);
return;
}

Debug.Assert(addNonCategorizedDiagnostic == null);
Debug.Assert(addCategorizedNonLocalDiagnostic != null);
Debug.Assert(_addNonCategorizedDiagnostic == null);
Debug.Assert(_addCategorizedNonLocalDiagnostic != null);

if (diagnostic.Location.IsInSource)
if (diagnostic.Location.IsInSource)
{
var symbol = symbolDeclaredEvent.Symbol;
foreach (var syntaxRef in symbolDeclaredEvent.DeclaringSyntaxReferences)
{
foreach (var syntaxRef in cachedDeclaringReferences)
if (syntaxRef.SyntaxTree == diagnostic.Location.SourceTree)
{
if (syntaxRef.SyntaxTree == diagnostic.Location.SourceTree)
var syntax = getTopMostNodeForAnalysis(symbol, syntaxRef, this.Compilation, cancellationToken);
if (diagnostic.Location.SourceSpan.IntersectsWith(syntax.FullSpan))
{
var syntax = getTopMostNodeForAnalysis(contextSymbol, syntaxRef, compilation, cancellationToken);
if (diagnostic.Location.SourceSpan.IntersectsWith(syntax.FullSpan))
{
addCategorizedLocalDiagnostic(diagnostic, analyzer, options, false, cancellationToken);
return;
}
_addCategorizedLocalDiagnostic(diagnostic, analyzer, options, false, cancellationToken);
return;
}
}
}
}

addCategorizedNonLocalDiagnostic(diagnostic, analyzer, options, cancellationToken);
};
_addCategorizedNonLocalDiagnostic(diagnostic, analyzer, options, cancellationToken);
}

private Action<Diagnostic> GetAddCompilationDiagnostic(
Expand Down