From 5cc443cba88a0dffe02ad24726b3553337289f39 Mon Sep 17 00:00:00 2001 From: Adrian Prantl Date: Fri, 18 Sep 2015 22:10:59 +0000 Subject: [PATCH] Simplify the interface of PCHContainerGenerator and friends by passing in a CompilerInstance instead of all its individual members. NFC. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@248053 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../ObjectFilePCHContainerOperations.h | 7 +++--- .../clang/Frontend/PCHContainerOperations.h | 20 ++++++--------- .../ObjectFilePCHContainerOperations.cpp | 25 +++++++++---------- lib/Frontend/FrontendActions.cpp | 14 +++-------- lib/Frontend/PCHContainerOperations.cpp | 19 ++++---------- 5 files changed, 31 insertions(+), 54 deletions(-) diff --git a/include/clang/CodeGen/ObjectFilePCHContainerOperations.h b/include/clang/CodeGen/ObjectFilePCHContainerOperations.h index e82aab7875..031e6b43c8 100644 --- a/include/clang/CodeGen/ObjectFilePCHContainerOperations.h +++ b/include/clang/CodeGen/ObjectFilePCHContainerOperations.h @@ -23,10 +23,9 @@ class ObjectFilePCHContainerWriter : public PCHContainerWriter { /// PCHGenerator that produces a wrapper file format /// that also contains full debug info for the module. std::unique_ptr CreatePCHContainerGenerator( - DiagnosticsEngine &Diags, const HeaderSearchOptions &HSO, - const PreprocessorOptions &PPO, const TargetOptions &TO, - const LangOptions &LO, const std::string &MainFileName, - const std::string &OutputFileName, llvm::raw_pwrite_stream *OS, + DiagnosticsEngine &Diags, const CompilerInstance &CI, + const std::string &MainFileName, const std::string &OutputFileName, + llvm::raw_pwrite_stream *OS, std::shared_ptr Buffer) const override; }; diff --git a/include/clang/Frontend/PCHContainerOperations.h b/include/clang/Frontend/PCHContainerOperations.h index 868ea6866a..f6a742731b 100644 --- a/include/clang/Frontend/PCHContainerOperations.h +++ b/include/clang/Frontend/PCHContainerOperations.h @@ -27,10 +27,7 @@ namespace clang { class ASTConsumer; class CodeGenOptions; class DiagnosticsEngine; -class HeaderSearchOptions; -class LangOptions; -class PreprocessorOptions; -class TargetOptions; +class CompilerInstance; struct PCHBuffer { bool IsComplete; @@ -49,11 +46,9 @@ public: /// PCHGenerator that produces a wrapper file format containing a /// serialized AST bitstream. virtual std::unique_ptr CreatePCHContainerGenerator( - DiagnosticsEngine &Diags, const HeaderSearchOptions &HSO, - const PreprocessorOptions &PPO, const TargetOptions &TO, - const LangOptions &LO, const std::string &MainFileName, - const std::string &OutputFileName, llvm::raw_pwrite_stream *OS, - std::shared_ptr Buffer) const = 0; + DiagnosticsEngine &Diags, const CompilerInstance &CI, + const std::string &MainFileName, const std::string &OutputFileName, + llvm::raw_pwrite_stream *OS, std::shared_ptr Buffer) const = 0; }; /// This abstract interface provides operations for unwrapping @@ -78,10 +73,9 @@ class RawPCHContainerWriter : public PCHContainerWriter { /// Return an ASTConsumer that can be chained with a /// PCHGenerator that writes the module to a flat file. std::unique_ptr CreatePCHContainerGenerator( - DiagnosticsEngine &Diags, const HeaderSearchOptions &HSO, - const PreprocessorOptions &PPO, const TargetOptions &TO, - const LangOptions &LO, const std::string &MainFileName, - const std::string &OutputFileName, llvm::raw_pwrite_stream *OS, + DiagnosticsEngine &Diags, const CompilerInstance &CI, + const std::string &MainFileName, const std::string &OutputFileName, + llvm::raw_pwrite_stream *OS, std::shared_ptr Buffer) const override; }; diff --git a/lib/CodeGen/ObjectFilePCHContainerOperations.cpp b/lib/CodeGen/ObjectFilePCHContainerOperations.cpp index b16544e2e1..b78005ce8f 100644 --- a/lib/CodeGen/ObjectFilePCHContainerOperations.cpp +++ b/lib/CodeGen/ObjectFilePCHContainerOperations.cpp @@ -18,6 +18,7 @@ #include "clang/Basic/TargetInfo.h" #include "clang/CodeGen/BackendUtil.h" #include "clang/Frontend/CodeGenOptions.h" +#include "clang/Frontend/CompilerInstance.h" #include "clang/Serialization/ASTWriter.h" #include "llvm/ADT/StringRef.h" #include "llvm/Bitcode/BitstreamReader.h" @@ -115,15 +116,15 @@ class PCHContainerGenerator : public ASTConsumer { }; public: - PCHContainerGenerator(DiagnosticsEngine &diags, - const HeaderSearchOptions &HSO, - const PreprocessorOptions &PPO, const TargetOptions &TO, - const LangOptions &LO, const std::string &MainFileName, + PCHContainerGenerator(DiagnosticsEngine &diags, const CompilerInstance &CI, + const std::string &MainFileName, const std::string &OutputFileName, raw_pwrite_stream *OS, std::shared_ptr Buffer) - : Diags(diags), Ctx(nullptr), HeaderSearchOpts(HSO), PreprocessorOpts(PPO), - TargetOpts(TO), LangOpts(LO), OS(OS), Buffer(Buffer) { + : Diags(diags), Ctx(nullptr), HeaderSearchOpts(CI.getHeaderSearchOpts()), + PreprocessorOpts(CI.getPreprocessorOpts()), + TargetOpts(CI.getTargetOpts()), LangOpts(CI.getLangOpts()), OS(OS), + Buffer(Buffer) { // The debug info output isn't affected by CodeModel and // ThreadModel, but the backend expects them to be nonempty. CodeGenOpts.CodeModel = "default"; @@ -252,13 +253,11 @@ public: std::unique_ptr ObjectFilePCHContainerWriter::CreatePCHContainerGenerator( - DiagnosticsEngine &Diags, const HeaderSearchOptions &HSO, - const PreprocessorOptions &PPO, const TargetOptions &TO, - const LangOptions &LO, const std::string &MainFileName, - const std::string &OutputFileName, llvm::raw_pwrite_stream *OS, - std::shared_ptr Buffer) const { - return llvm::make_unique( - Diags, HSO, PPO, TO, LO, MainFileName, OutputFileName, OS, Buffer); + DiagnosticsEngine &Diags, const CompilerInstance &CI, + const std::string &MainFileName, const std::string &OutputFileName, + llvm::raw_pwrite_stream *OS, std::shared_ptr Buffer) const { + return llvm::make_unique(Diags, CI, MainFileName, + OutputFileName, OS, Buffer); } void ObjectFilePCHContainerReader::ExtractPCH( diff --git a/lib/Frontend/FrontendActions.cpp b/lib/Frontend/FrontendActions.cpp index 782b713d3e..be4ec5b123 100644 --- a/lib/Frontend/FrontendActions.cpp +++ b/lib/Frontend/FrontendActions.cpp @@ -92,11 +92,8 @@ GeneratePCHAction::CreateASTConsumer(CompilerInstance &CI, StringRef InFile) { std::vector> Consumers; Consumers.push_back(llvm::make_unique( CI.getPreprocessor(), OutputFile, nullptr, Sysroot, Buffer)); - Consumers.push_back( - CI.getPCHContainerWriter().CreatePCHContainerGenerator( - CI.getDiagnostics(), CI.getHeaderSearchOpts(), - CI.getPreprocessorOpts(), CI.getTargetOpts(), CI.getLangOpts(), - InFile, OutputFile, OS, Buffer)); + Consumers.push_back(CI.getPCHContainerWriter().CreatePCHContainerGenerator( + CI.getDiagnostics(), CI, InFile, OutputFile, OS, Buffer)); return llvm::make_unique(std::move(Consumers)); } @@ -140,11 +137,8 @@ GenerateModuleAction::CreateASTConsumer(CompilerInstance &CI, CI.getPreprocessor(), OutputFile, Module, Sysroot, Buffer, /*AllowASTWithErrors*/false, /*IncludeTimestamps*/+CI.getFrontendOpts().BuildingImplicitModule)); - Consumers.push_back( - CI.getPCHContainerWriter().CreatePCHContainerGenerator( - CI.getDiagnostics(), CI.getHeaderSearchOpts(), - CI.getPreprocessorOpts(), CI.getTargetOpts(), CI.getLangOpts(), - InFile, OutputFile, OS, Buffer)); + Consumers.push_back(CI.getPCHContainerWriter().CreatePCHContainerGenerator( + CI.getDiagnostics(), CI, InFile, OutputFile, OS, Buffer)); return llvm::make_unique(std::move(Consumers)); } diff --git a/lib/Frontend/PCHContainerOperations.cpp b/lib/Frontend/PCHContainerOperations.cpp index 5d73a86a00..5cf8de44dc 100644 --- a/lib/Frontend/PCHContainerOperations.cpp +++ b/lib/Frontend/PCHContainerOperations.cpp @@ -27,13 +27,7 @@ class RawPCHContainerGenerator : public ASTConsumer { raw_pwrite_stream *OS; public: - RawPCHContainerGenerator(DiagnosticsEngine &Diags, - const HeaderSearchOptions &HSO, - const PreprocessorOptions &PPO, - const TargetOptions &TO, const LangOptions &LO, - const std::string &MainFileName, - const std::string &OutputFileName, - llvm::raw_pwrite_stream *OS, + RawPCHContainerGenerator(llvm::raw_pwrite_stream *OS, std::shared_ptr Buffer) : Buffer(Buffer), OS(OS) {} @@ -54,13 +48,10 @@ public: } // anonymous namespace std::unique_ptr RawPCHContainerWriter::CreatePCHContainerGenerator( - DiagnosticsEngine &Diags, const HeaderSearchOptions &HSO, - const PreprocessorOptions &PPO, const TargetOptions &TO, - const LangOptions &LO, const std::string &MainFileName, - const std::string &OutputFileName, llvm::raw_pwrite_stream *OS, - std::shared_ptr Buffer) const { - return llvm::make_unique( - Diags, HSO, PPO, TO, LO, MainFileName, OutputFileName, OS, Buffer); + DiagnosticsEngine &Diags, const CompilerInstance &CI, + const std::string &MainFileName, const std::string &OutputFileName, + llvm::raw_pwrite_stream *OS, std::shared_ptr Buffer) const { + return llvm::make_unique(OS, Buffer); } void RawPCHContainerReader::ExtractPCH( -- 2.50.1