Author: Jan Svoboda Date: 2024-11-06T12:54:01-08:00 New Revision: 304c41217303ce613de8f4042e570ac6ca8757e8
URL: https://github.com/llvm/llvm-project/commit/304c41217303ce613de8f4042e570ac6ca8757e8 DIFF: https://github.com/llvm/llvm-project/commit/304c41217303ce613de8f4042e570ac6ca8757e8.diff LOG: [clang][serialization] Reduce `ASTWriter::writeUnhashedControlBlock()` scope Added: Modified: clang/include/clang/Serialization/ASTWriter.h clang/lib/Serialization/ASTWriter.cpp Removed: ################################################################################ diff --git a/clang/include/clang/Serialization/ASTWriter.h b/clang/include/clang/Serialization/ASTWriter.h index 83684443ca948e..d0e841f367c1e0 100644 --- a/clang/include/clang/Serialization/ASTWriter.h +++ b/clang/include/clang/Serialization/ASTWriter.h @@ -551,7 +551,7 @@ class ASTWriter : public ASTDeserializationListener, void WriteControlBlock(Preprocessor &PP, StringRef isysroot); /// Write out the signature and diagnostic options, and return the signature. - void writeUnhashedControlBlock(Preprocessor &PP, ASTContext &Context); + void writeUnhashedControlBlock(Preprocessor &PP); ASTFileSignature backpatchSignature(); /// Calculate hash of the pcm content. diff --git a/clang/lib/Serialization/ASTWriter.cpp b/clang/lib/Serialization/ASTWriter.cpp index 13ee9904b29fd3..b95e29cbc02515 100644 --- a/clang/lib/Serialization/ASTWriter.cpp +++ b/clang/lib/Serialization/ASTWriter.cpp @@ -1269,8 +1269,7 @@ ASTFileSignature ASTWriter::backpatchSignature() { return Signature; } -void ASTWriter::writeUnhashedControlBlock(Preprocessor &PP, - ASTContext &Context) { +void ASTWriter::writeUnhashedControlBlock(Preprocessor &PP) { using namespace llvm; // Flush first to prepare the PCM hash (signature). @@ -1323,7 +1322,7 @@ void ASTWriter::writeUnhashedControlBlock(Preprocessor &PP, const auto &HSOpts = PP.getHeaderSearchInfo().getHeaderSearchOpts(); // Diagnostic options. - const auto &Diags = Context.getDiagnostics(); + const auto &Diags = PP.getDiagnostics(); const DiagnosticOptions &DiagOpts = Diags.getDiagnosticOptions(); if (!HSOpts.ModulesSkipDiagnosticOptions) { #define DIAGOPT(Name, Bits, Default) Record.push_back(DiagOpts.Name); @@ -5368,7 +5367,7 @@ ASTFileSignature ASTWriter::WriteASTCore(Sema &SemaRef, StringRef isysroot, // SourceLocations or FileIDs depends on it. computeNonAffectingInputFiles(); - writeUnhashedControlBlock(PP, Context); + writeUnhashedControlBlock(PP); // Don't reuse type ID and Identifier ID from readers for C++ standard named // modules since we want to support no-transitive-change model for named _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
