From 9293ba8e26fcba18505b273ecc9b66645133fcce Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Thu, 25 Aug 2011 22:35:51 +0000 Subject: [PATCH] Remove the Chaining argument from the PCH/module generator. It's no longer used git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@138596 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Frontend/FrontendActions.h | 3 +-- include/clang/Serialization/ASTWriter.h | 3 +-- lib/Frontend/ASTUnit.cpp | 12 +++++------- lib/Frontend/FrontendActions.cpp | 12 +++--------- lib/Serialization/ChainedIncludesSource.cpp | 1 - lib/Serialization/GeneratePCH.cpp | 12 +++--------- 6 files changed, 13 insertions(+), 30 deletions(-) diff --git a/include/clang/Frontend/FrontendActions.h b/include/clang/Frontend/FrontendActions.h index ef204312c4..72a3d90847 100644 --- a/include/clang/Frontend/FrontendActions.h +++ b/include/clang/Frontend/FrontendActions.h @@ -91,8 +91,7 @@ public: StringRef InFile, std::string &Sysroot, std::string &OutputFile, - raw_ostream *&OS, - bool &Chaining); + raw_ostream *&OS); }; class SyntaxOnlyAction : public ASTFrontendAction { diff --git a/include/clang/Serialization/ASTWriter.h b/include/clang/Serialization/ASTWriter.h index 1bb8edb073..a3a5b433b5 100644 --- a/include/clang/Serialization/ASTWriter.h +++ b/include/clang/Serialization/ASTWriter.h @@ -634,7 +634,6 @@ class PCHGenerator : public SemaConsumer { std::vector Buffer; llvm::BitstreamWriter Stream; ASTWriter Writer; - bool Chaining; protected: ASTWriter &getWriter() { return Writer; } @@ -642,7 +641,7 @@ protected: public: PCHGenerator(const Preprocessor &PP, StringRef OutputFile, - bool Chaining, StringRef isysroot, raw_ostream *Out); + StringRef isysroot, raw_ostream *Out); ~PCHGenerator(); virtual void InitializeSema(Sema &S) { SemaPtr = &S; } virtual void HandleTranslationUnit(ASTContext &Ctx); diff --git a/lib/Frontend/ASTUnit.cpp b/lib/Frontend/ASTUnit.cpp index b8d9f2f8c2..e3d56367fd 100644 --- a/lib/Frontend/ASTUnit.cpp +++ b/lib/Frontend/ASTUnit.cpp @@ -771,10 +771,9 @@ class PrecompilePreambleConsumer : public PCHGenerator, std::vector TopLevelDecls; public: - PrecompilePreambleConsumer(ASTUnit &Unit, - const Preprocessor &PP, bool Chaining, + PrecompilePreambleConsumer(ASTUnit &Unit, const Preprocessor &PP, StringRef isysroot, raw_ostream *Out) - : PCHGenerator(PP, "", Chaining, isysroot, Out), Unit(Unit), + : PCHGenerator(PP, "", isysroot, Out), Unit(Unit), Hash(Unit.getCurrentTopLevelHashValue()) { Hash = 0; } @@ -827,10 +826,9 @@ public: std::string Sysroot; std::string OutputFile; raw_ostream *OS = 0; - bool Chaining; if (GeneratePCHAction::ComputeASTConsumerArguments(CI, InFile, Sysroot, OutputFile, - OS, Chaining)) + OS)) return 0; if (!CI.getFrontendOpts().RelocatablePCH) @@ -838,8 +836,8 @@ public: CI.getPreprocessor().addPPCallbacks( new MacroDefinitionTrackerPPCallbacks(Unit.getCurrentTopLevelHashValue())); - return new PrecompilePreambleConsumer(Unit, CI.getPreprocessor(), Chaining, - Sysroot, OS); + return new PrecompilePreambleConsumer(Unit, CI.getPreprocessor(), Sysroot, + OS); } virtual bool hasCodeCompletionSupport() const { return false; } diff --git a/lib/Frontend/FrontendActions.cpp b/lib/Frontend/FrontendActions.cpp index 5e2b9c473f..e05d5767ea 100644 --- a/lib/Frontend/FrontendActions.cpp +++ b/lib/Frontend/FrontendActions.cpp @@ -78,23 +78,19 @@ ASTConsumer *GeneratePCHAction::CreateASTConsumer(CompilerInstance &CI, std::string Sysroot; std::string OutputFile; raw_ostream *OS = 0; - bool Chaining; - if (ComputeASTConsumerArguments(CI, InFile, Sysroot, OutputFile, OS, - Chaining)) + if (ComputeASTConsumerArguments(CI, InFile, Sysroot, OutputFile, OS)) return 0; if (!CI.getFrontendOpts().RelocatablePCH) Sysroot.clear(); - return new PCHGenerator(CI.getPreprocessor(), OutputFile, Chaining, Sysroot, - OS); + return new PCHGenerator(CI.getPreprocessor(), OutputFile, Sysroot, OS); } bool GeneratePCHAction::ComputeASTConsumerArguments(CompilerInstance &CI, StringRef InFile, std::string &Sysroot, std::string &OutputFile, - raw_ostream *&OS, - bool &Chaining) { + raw_ostream *&OS) { Sysroot = CI.getHeaderSearchOpts().Sysroot; if (CI.getFrontendOpts().RelocatablePCH && Sysroot.empty()) { CI.getDiagnostics().Report(diag::err_relocatable_without_isysroot); @@ -111,8 +107,6 @@ bool GeneratePCHAction::ComputeASTConsumerArguments(CompilerInstance &CI, return true; OutputFile = CI.getFrontendOpts().OutputFile; - Chaining = CI.getInvocation().getFrontendOpts().ChainedPCH && - !CI.getPreprocessorOpts().ImplicitPCHInclude.empty(); return false; } diff --git a/lib/Serialization/ChainedIncludesSource.cpp b/lib/Serialization/ChainedIncludesSource.cpp index 4ee1c1667f..56dc07f4cb 100644 --- a/lib/Serialization/ChainedIncludesSource.cpp +++ b/lib/Serialization/ChainedIncludesSource.cpp @@ -106,7 +106,6 @@ ChainedIncludesSource *ChainedIncludesSource::create(CompilerInstance &CI) { llvm::raw_svector_ostream OS(serialAST); llvm::OwningPtr consumer; consumer.reset(new PCHGenerator(Clang->getPreprocessor(), "-", - /*Chaining=*/!firstInclude, /*isysroot=*/"", &OS)); Clang->getASTContext().setASTMutationListener( consumer->GetASTMutationListener()); diff --git a/lib/Serialization/GeneratePCH.cpp b/lib/Serialization/GeneratePCH.cpp index ac395bb2d6..358954ed19 100644 --- a/lib/Serialization/GeneratePCH.cpp +++ b/lib/Serialization/GeneratePCH.cpp @@ -28,18 +28,14 @@ using namespace clang; PCHGenerator::PCHGenerator(const Preprocessor &PP, StringRef OutputFile, - bool Chaining, StringRef isysroot, raw_ostream *OS) : PP(PP), OutputFile(OutputFile), isysroot(isysroot.str()), Out(OS), - SemaPtr(0), StatCalls(0), Stream(Buffer), Writer(Stream), Chaining(Chaining) { + SemaPtr(0), StatCalls(0), Stream(Buffer), Writer(Stream) { // Install a stat() listener to keep track of all of the stat() // calls. StatCalls = new MemorizeStatCalls(); - // If we have a chain, we want new stat calls only, so install the memorizer - // *after* the already installed ASTReader's stat cache. - PP.getFileManager().addStatCache(StatCalls, - /*AtBeginning=*/!Chaining); + PP.getFileManager().addStatCache(StatCalls, /*AtBeginning=*/false); } PCHGenerator::~PCHGenerator() { @@ -67,9 +63,7 @@ void PCHGenerator::HandleTranslationUnit(ASTContext &Ctx) { } ASTMutationListener *PCHGenerator::GetASTMutationListener() { - if (Chaining) - return &Writer; - return 0; + return &Writer; } ASTSerializationListener *PCHGenerator::GetASTSerializationListener() { -- 2.40.0