[clang] NFCI: Mutate HeaderSearchOptions earlier
#130823
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
clang
|
@llvm/pr-subscribers-clang Author: Jan Svoboda (jansvoboda11) ChangesI would like to ensure that Full diff: https://github.com/llvm/llvm-project/pull/130823.diff 3 Files Affected:
diff --git a/clang/include/clang/Lex/HeaderSearchOptions.h b/clang/include/clang/Lex/HeaderSearchOptions.h
index 7a16926c186d2..68308f5693ac6 100644
--- a/clang/include/clang/Lex/HeaderSearchOptions.h
+++ b/clang/include/clang/Lex/HeaderSearchOptions.h
@@ -235,6 +235,7 @@ class HeaderSearchOptions {
/// Whether to entirely skip writing diagnostic options.
/// Primarily used to speed up deserialization during dependency scanning.
+ /// FIXME: Consider moving these into separate `SerializationOptions` class.
LLVM_PREFERRED_TYPE(bool)
unsigned ModulesSkipDiagnosticOptions : 1;
diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp
index 4eb743acf327f..34821d9f8dd30 100644
--- a/clang/lib/Frontend/CompilerInvocation.cpp
+++ b/clang/lib/Frontend/CompilerInvocation.cpp
@@ -4964,6 +4964,12 @@ bool CompilerInvocation::CreateFromArgsImpl(
llvm::Triple T(Res.getTargetOpts().Triple);
ParseHeaderSearchArgs(Res.getHeaderSearchOpts(), Args, Diags,
Res.getFileSystemOpts().WorkingDir);
+ if (Res.getFrontendOpts().GenReducedBMI ||
+ Res.getFrontendOpts().ProgramAction ==
+ frontend::GenerateReducedModuleInterface) {
+ Res.getHeaderSearchOpts().ModulesSkipDiagnosticOptions = true;
+ Res.getHeaderSearchOpts().ModulesSkipHeaderSearchPaths = true;
+ }
ParseAPINotesArgs(Res.getAPINotesOpts(), Args, Diags);
ParsePointerAuthArgs(LangOpts, Args, Diags);
diff --git a/clang/lib/Serialization/GeneratePCH.cpp b/clang/lib/Serialization/GeneratePCH.cpp
index 12751beb8d715..512d5050d6520 100644
--- a/clang/lib/Serialization/GeneratePCH.cpp
+++ b/clang/lib/Serialization/GeneratePCH.cpp
@@ -120,13 +120,6 @@ Module *CXX20ModulesGenerator::getEmittingModule(ASTContext &Ctx) {
}
void CXX20ModulesGenerator::HandleTranslationUnit(ASTContext &Ctx) {
- // FIMXE: We'd better to wrap such options to a new class ASTWriterOptions
- // since this is not about searching header really.
- HeaderSearchOptions &HSOpts =
- getPreprocessor().getHeaderSearchInfo().getHeaderSearchOpts();
- HSOpts.ModulesSkipDiagnosticOptions = true;
- HSOpts.ModulesSkipHeaderSearchPaths = true;
-
PCHGenerator::HandleTranslationUnit(Ctx);
if (!isComplete())
|
|
@llvm/pr-subscribers-clang-modules Author: Jan Svoboda (jansvoboda11) ChangesI would like to ensure that Full diff: https://github.com/llvm/llvm-project/pull/130823.diff 3 Files Affected:
diff --git a/clang/include/clang/Lex/HeaderSearchOptions.h b/clang/include/clang/Lex/HeaderSearchOptions.h
index 7a16926c186d2..68308f5693ac6 100644
--- a/clang/include/clang/Lex/HeaderSearchOptions.h
+++ b/clang/include/clang/Lex/HeaderSearchOptions.h
@@ -235,6 +235,7 @@ class HeaderSearchOptions {
/// Whether to entirely skip writing diagnostic options.
/// Primarily used to speed up deserialization during dependency scanning.
+ /// FIXME: Consider moving these into separate `SerializationOptions` class.
LLVM_PREFERRED_TYPE(bool)
unsigned ModulesSkipDiagnosticOptions : 1;
diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp
index 4eb743acf327f..34821d9f8dd30 100644
--- a/clang/lib/Frontend/CompilerInvocation.cpp
+++ b/clang/lib/Frontend/CompilerInvocation.cpp
@@ -4964,6 +4964,12 @@ bool CompilerInvocation::CreateFromArgsImpl(
llvm::Triple T(Res.getTargetOpts().Triple);
ParseHeaderSearchArgs(Res.getHeaderSearchOpts(), Args, Diags,
Res.getFileSystemOpts().WorkingDir);
+ if (Res.getFrontendOpts().GenReducedBMI ||
+ Res.getFrontendOpts().ProgramAction ==
+ frontend::GenerateReducedModuleInterface) {
+ Res.getHeaderSearchOpts().ModulesSkipDiagnosticOptions = true;
+ Res.getHeaderSearchOpts().ModulesSkipHeaderSearchPaths = true;
+ }
ParseAPINotesArgs(Res.getAPINotesOpts(), Args, Diags);
ParsePointerAuthArgs(LangOpts, Args, Diags);
diff --git a/clang/lib/Serialization/GeneratePCH.cpp b/clang/lib/Serialization/GeneratePCH.cpp
index 12751beb8d715..512d5050d6520 100644
--- a/clang/lib/Serialization/GeneratePCH.cpp
+++ b/clang/lib/Serialization/GeneratePCH.cpp
@@ -120,13 +120,6 @@ Module *CXX20ModulesGenerator::getEmittingModule(ASTContext &Ctx) {
}
void CXX20ModulesGenerator::HandleTranslationUnit(ASTContext &Ctx) {
- // FIMXE: We'd better to wrap such options to a new class ASTWriterOptions
- // since this is not about searching header really.
- HeaderSearchOptions &HSOpts =
- getPreprocessor().getHeaderSearchInfo().getHeaderSearchOpts();
- HSOpts.ModulesSkipDiagnosticOptions = true;
- HSOpts.ModulesSkipHeaderSearchPaths = true;
-
PCHGenerator::HandleTranslationUnit(Ctx);
if (!isComplete())
|
Bigcheese
reviewed
Mar 11, 2025
Comment on lines
4967
to
4972
| if (Res.getFrontendOpts().GenReducedBMI || | ||
| Res.getFrontendOpts().ProgramAction == | ||
| frontend::GenerateReducedModuleInterface) { | ||
| Res.getHeaderSearchOpts().ModulesSkipDiagnosticOptions = true; | ||
| Res.getHeaderSearchOpts().ModulesSkipHeaderSearchPaths = true; | ||
| } |
There was a problem hiding this comment.
Does this actually have the same semantics? These appear to always be true for GenerateModuleInterfaceAction regardless of reduced BMI or not.
There was a problem hiding this comment.
You're right, the semantics probably changed. All tests passed locally on macOS, though 🤔 @ChuanqiXu9, can you clarify what the intent is?
There was a problem hiding this comment.
Ping @ChuanqiXu9.
Bigcheese
approved these changes
Mar 21, 2025
jansvoboda11
added a commit
that referenced
this pull request
Mar 21, 2025
This PR makes the `HeaderSearchOptions` object referenced by `HeaderSearch` constant. Depends on #130823.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I would like to ensure that
CompilerInvocationand its constituents are not mutated late during the compilation. This PR moves adjustment of theHeaderSearchOptions::ModulesSkip{DiagnosticOptions,HeaderSearchPaths}bits from somewhere deep in the serialization library intoCompilerInvocation::CreateFromArgs().