https://github.com/steakhal created https://github.com/llvm/llvm-project/pull/235281
BugReporter.h includes clang/Lex/Preprocessor.h, and that single edge pulls the whole Lex subtree -- roughly 34 headers, among them Basic/Module.h, HeaderSearch.h and ModuleMap.h -- into 161 of the 197 translation units that make up clangStaticAnalyzerCore, clangStaticAnalyzerCheckers and clangStaticAnalyzerFrontend. The mechanism is transitive inclusion, not any use of the preprocessor: nearly every analyzer source reaches BugReporter.h, so nearly every one of them parses Preprocessor.h and everything it brings with it. The include is not needed. Preprocessor appears in this header only as a reference return type in three declarations, and no member of it is ever named, so a forward declaration in namespace clang suffices and the generated code is identical. Eight .cpp files were relying on SourceManager completeness arriving through Preprocessor.h and now include clang/Basic/SourceManager.h directly; that is the only compensating change, and no translation unit needed Preprocessor.h added back. On its own this patch measures -0.74% of total frontend time (rounds -0.35% and -1.12%), which is to say essentially nothing. The reason is that AnalysisManager.h carries its own #include of Preprocessor.h, which keeps the Lex subtree alive in 147 of those translation units; this patch removes it from only 14. The win arrives with the companion patch that forward-declares Preprocessor in AnalysisManager.h: together the two measure -12.29% of total CSA frontend time, roughly 54 s out of a 443 s total. The two edges are mutually redundant -- cut either one alone and the other keeps the entire Lex subtree alive -- so a reviewer who benchmarks this patch in isolation will correctly see nothing. It should be evaluated as the first half of a two-patch stack. Authored-By: Claude --- <sub>Stack created with <a href="https://github.com/github/gh-stack";>GitHub Stacks CLI</a> • <a href="https://gh.io/stacks-feedback";>Give Feedback 💬</a></sub> From 63107e0a628bd7eaf1db3640cd8efced6bceb8cc Mon Sep 17 00:00:00 2001 From: Balazs Benics <[email protected]> Date: Sat, 24 Oct 2026 11:22:08 +0100 Subject: [PATCH] [analyzer][NFC] Forward-declare Preprocessor in BugReporter.h BugReporter.h includes clang/Lex/Preprocessor.h, and that single edge pulls the whole Lex subtree -- roughly 34 headers, among them Basic/Module.h, HeaderSearch.h and ModuleMap.h -- into 161 of the 197 translation units that make up clangStaticAnalyzerCore, clangStaticAnalyzerCheckers and clangStaticAnalyzerFrontend. The mechanism is transitive inclusion, not any use of the preprocessor: nearly every analyzer source reaches BugReporter.h, so nearly every one of them parses Preprocessor.h and everything it brings with it. The include is not needed. Preprocessor appears in this header only as a reference return type in three declarations, and no member of it is ever named, so a forward declaration in namespace clang suffices and the generated code is identical. Eight .cpp files were relying on SourceManager completeness arriving through Preprocessor.h and now include clang/Basic/SourceManager.h directly; that is the only compensating change, and no translation unit needed Preprocessor.h added back. On its own this patch measures -0.74% of total frontend time (rounds -0.35% and -1.12%), which is to say essentially nothing. The reason is that AnalysisManager.h carries its own #include of Preprocessor.h, which keeps the Lex subtree alive in 147 of those translation units; this patch removes it from only 14. The win arrives with the companion patch that forward-declares Preprocessor in AnalysisManager.h: together the two measure -12.29% of total CSA frontend time, roughly 54 s out of a 443 s total. The two edges are mutually redundant -- cut either one alone and the other keeps the entire Lex subtree alive -- so a reviewer who benchmarks this patch in isolation will correctly see nothing. It should be evaluated as the first half of a two-patch stack. Authored-By: Claude --- .../include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h | 2 +- clang/lib/StaticAnalyzer/Checkers/WebKit/ForwardDeclChecker.cpp | 1 + .../StaticAnalyzer/Checkers/WebKit/RawPtrRefCallArgsChecker.cpp | 1 + .../Checkers/WebKit/RawPtrRefLambdaCapturesChecker.cpp | 1 + .../Checkers/WebKit/RawPtrRefLocalVarsChecker.cpp | 1 + .../StaticAnalyzer/Checkers/WebKit/RawPtrRefMemberChecker.cpp | 1 + .../Checkers/WebKit/RefCntblBaseVirtualDtorChecker.cpp | 1 + .../Checkers/WebKit/RetainPtrCtorAdoptChecker.cpp | 1 + clang/lib/StaticAnalyzer/Core/BugSuppression.cpp | 1 + 9 files changed, 9 insertions(+), 1 deletion(-) diff --git a/clang/include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h b/clang/include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h index 51c54151ac07b8..7a617c5c388263 100644 --- a/clang/include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h +++ b/clang/include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h @@ -17,7 +17,6 @@ #include "clang/Analysis/PathDiagnostic.h" #include "clang/Basic/LLVM.h" #include "clang/Basic/SourceLocation.h" -#include "clang/Lex/Preprocessor.h" #include "clang/StaticAnalyzer/Core/BugReporter/BugReporterVisitors.h" #include "clang/StaticAnalyzer/Core/BugReporter/BugSuppression.h" #include "clang/StaticAnalyzer/Core/BugReporter/BugType.h" @@ -49,6 +48,7 @@ namespace clang { class AnalyzerOptions; class ASTContext; class Decl; +class Preprocessor; class SourceManager; class Stmt; diff --git a/clang/lib/StaticAnalyzer/Checkers/WebKit/ForwardDeclChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/WebKit/ForwardDeclChecker.cpp index 8cdea79956fc0f..6fb775c878e738 100644 --- a/clang/lib/StaticAnalyzer/Checkers/WebKit/ForwardDeclChecker.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/WebKit/ForwardDeclChecker.cpp @@ -14,6 +14,7 @@ #include "clang/AST/RecursiveASTVisitor.h" #include "clang/Analysis/DomainSpecific/CocoaConventions.h" #include "clang/Basic/SourceLocation.h" +#include "clang/Basic/SourceManager.h" #include "clang/StaticAnalyzer/Checkers/BuiltinCheckerRegistration.h" #include "clang/StaticAnalyzer/Core/BugReporter/BugReporter.h" #include "clang/StaticAnalyzer/Core/BugReporter/BugType.h" diff --git a/clang/lib/StaticAnalyzer/Checkers/WebKit/RawPtrRefCallArgsChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/WebKit/RawPtrRefCallArgsChecker.cpp index 0906cf2d0cb29b..51d592660d62f7 100644 --- a/clang/lib/StaticAnalyzer/Checkers/WebKit/RawPtrRefCallArgsChecker.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/WebKit/RawPtrRefCallArgsChecker.cpp @@ -15,6 +15,7 @@ #include "clang/AST/DynamicRecursiveASTVisitor.h" #include "clang/Analysis/DomainSpecific/CocoaConventions.h" #include "clang/Basic/SourceLocation.h" +#include "clang/Basic/SourceManager.h" #include "clang/Lex/Lexer.h" #include "clang/StaticAnalyzer/Checkers/BuiltinCheckerRegistration.h" #include "clang/StaticAnalyzer/Core/BugReporter/BugReporter.h" diff --git a/clang/lib/StaticAnalyzer/Checkers/WebKit/RawPtrRefLambdaCapturesChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/WebKit/RawPtrRefLambdaCapturesChecker.cpp index 2fcb0ef07c362b..d675a28469efad 100644 --- a/clang/lib/StaticAnalyzer/Checkers/WebKit/RawPtrRefLambdaCapturesChecker.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/WebKit/RawPtrRefLambdaCapturesChecker.cpp @@ -11,6 +11,7 @@ #include "PtrTypesSemantics.h" #include "RawPtrRefSafetyModel.h" #include "clang/AST/DynamicRecursiveASTVisitor.h" +#include "clang/Basic/SourceManager.h" #include "clang/StaticAnalyzer/Checkers/BuiltinCheckerRegistration.h" #include "clang/StaticAnalyzer/Core/BugReporter/BugReporter.h" #include "clang/StaticAnalyzer/Core/BugReporter/BugType.h" diff --git a/clang/lib/StaticAnalyzer/Checkers/WebKit/RawPtrRefLocalVarsChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/WebKit/RawPtrRefLocalVarsChecker.cpp index 2e493b0a49758a..91945caa608486 100644 --- a/clang/lib/StaticAnalyzer/Checkers/WebKit/RawPtrRefLocalVarsChecker.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/WebKit/RawPtrRefLocalVarsChecker.cpp @@ -18,6 +18,7 @@ #include "clang/AST/StmtObjC.h" #include "clang/Analysis/DomainSpecific/CocoaConventions.h" #include "clang/Basic/SourceLocation.h" +#include "clang/Basic/SourceManager.h" #include "clang/StaticAnalyzer/Checkers/BuiltinCheckerRegistration.h" #include "clang/StaticAnalyzer/Core/BugReporter/BugReporter.h" #include "clang/StaticAnalyzer/Core/BugReporter/BugType.h" diff --git a/clang/lib/StaticAnalyzer/Checkers/WebKit/RawPtrRefMemberChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/WebKit/RawPtrRefMemberChecker.cpp index 7ddd2e21c47b66..8b0ac3e4f2177e 100644 --- a/clang/lib/StaticAnalyzer/Checkers/WebKit/RawPtrRefMemberChecker.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/WebKit/RawPtrRefMemberChecker.cpp @@ -13,6 +13,7 @@ #include "clang/AST/Decl.h" #include "clang/AST/DeclCXX.h" #include "clang/AST/DynamicRecursiveASTVisitor.h" +#include "clang/Basic/SourceManager.h" #include "clang/StaticAnalyzer/Checkers/BuiltinCheckerRegistration.h" #include "clang/StaticAnalyzer/Core/BugReporter/BugReporter.h" #include "clang/StaticAnalyzer/Core/BugReporter/BugType.h" diff --git a/clang/lib/StaticAnalyzer/Checkers/WebKit/RefCntblBaseVirtualDtorChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/WebKit/RefCntblBaseVirtualDtorChecker.cpp index a5aef49c99b347..b883cb78705b6b 100644 --- a/clang/lib/StaticAnalyzer/Checkers/WebKit/RefCntblBaseVirtualDtorChecker.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/WebKit/RefCntblBaseVirtualDtorChecker.cpp @@ -12,6 +12,7 @@ #include "clang/AST/CXXInheritance.h" #include "clang/AST/DynamicRecursiveASTVisitor.h" #include "clang/AST/StmtVisitor.h" +#include "clang/Basic/SourceManager.h" #include "clang/StaticAnalyzer/Checkers/BuiltinCheckerRegistration.h" #include "clang/StaticAnalyzer/Core/BugReporter/BugReporter.h" #include "clang/StaticAnalyzer/Core/BugReporter/BugType.h" diff --git a/clang/lib/StaticAnalyzer/Checkers/WebKit/RetainPtrCtorAdoptChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/WebKit/RetainPtrCtorAdoptChecker.cpp index afa9fc7b1c4a4a..79b984f8d84198 100644 --- a/clang/lib/StaticAnalyzer/Checkers/WebKit/RetainPtrCtorAdoptChecker.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/WebKit/RetainPtrCtorAdoptChecker.cpp @@ -11,6 +11,7 @@ #include "clang/AST/RecursiveASTVisitor.h" #include "clang/Analysis/DomainSpecific/CocoaConventions.h" #include "clang/Analysis/RetainSummaryManager.h" +#include "clang/Basic/SourceManager.h" #include "clang/StaticAnalyzer/Checkers/BuiltinCheckerRegistration.h" #include "clang/StaticAnalyzer/Core/BugReporter/BugReporter.h" #include "clang/StaticAnalyzer/Core/BugReporter/BugType.h" diff --git a/clang/lib/StaticAnalyzer/Core/BugSuppression.cpp b/clang/lib/StaticAnalyzer/Core/BugSuppression.cpp index eb3f437b28ed92..70664c0a9063e6 100644 --- a/clang/lib/StaticAnalyzer/Core/BugSuppression.cpp +++ b/clang/lib/StaticAnalyzer/Core/BugSuppression.cpp @@ -8,6 +8,7 @@ #include "clang/StaticAnalyzer/Core/BugReporter/BugSuppression.h" #include "clang/AST/DynamicRecursiveASTVisitor.h" +#include "clang/Basic/SourceManager.h" #include "clang/StaticAnalyzer/Core/BugReporter/BugReporter.h" #include "llvm/ADT/STLExtras.h" #include "llvm/Support/FormatVariadic.h" _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
