diff options
Diffstat (limited to 'clang')
5 files changed, 19 insertions, 21 deletions
diff --git a/clang/include/clang/CodeGen/ObjectFilePCHContainerOperations.h b/clang/include/clang/CodeGen/ObjectFilePCHContainerOperations.h index 031e6b43c8b..15132acfc24 100644 --- a/clang/include/clang/CodeGen/ObjectFilePCHContainerOperations.h +++ b/clang/include/clang/CodeGen/ObjectFilePCHContainerOperations.h @@ -23,9 +23,8 @@ class ObjectFilePCHContainerWriter : public PCHContainerWriter { /// PCHGenerator that produces a wrapper file format /// that also contains full debug info for the module. std::unique_ptr<ASTConsumer> CreatePCHContainerGenerator( - DiagnosticsEngine &Diags, const CompilerInstance &CI, - const std::string &MainFileName, const std::string &OutputFileName, - llvm::raw_pwrite_stream *OS, + CompilerInstance &CI, const std::string &MainFileName, + const std::string &OutputFileName, llvm::raw_pwrite_stream *OS, std::shared_ptr<PCHBuffer> Buffer) const override; }; diff --git a/clang/include/clang/Frontend/PCHContainerOperations.h b/clang/include/clang/Frontend/PCHContainerOperations.h index f6a742731ba..92d9386207e 100644 --- a/clang/include/clang/Frontend/PCHContainerOperations.h +++ b/clang/include/clang/Frontend/PCHContainerOperations.h @@ -46,9 +46,9 @@ public: /// PCHGenerator that produces a wrapper file format containing a /// serialized AST bitstream. virtual std::unique_ptr<ASTConsumer> CreatePCHContainerGenerator( - DiagnosticsEngine &Diags, const CompilerInstance &CI, - const std::string &MainFileName, const std::string &OutputFileName, - llvm::raw_pwrite_stream *OS, std::shared_ptr<PCHBuffer> Buffer) const = 0; + CompilerInstance &CI, const std::string &MainFileName, + const std::string &OutputFileName, llvm::raw_pwrite_stream *OS, + std::shared_ptr<PCHBuffer> Buffer) const = 0; }; /// This abstract interface provides operations for unwrapping @@ -73,9 +73,8 @@ 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<ASTConsumer> CreatePCHContainerGenerator( - DiagnosticsEngine &Diags, const CompilerInstance &CI, - const std::string &MainFileName, const std::string &OutputFileName, - llvm::raw_pwrite_stream *OS, + CompilerInstance &CI, const std::string &MainFileName, + const std::string &OutputFileName, llvm::raw_pwrite_stream *OS, std::shared_ptr<PCHBuffer> Buffer) const override; }; diff --git a/clang/lib/CodeGen/ObjectFilePCHContainerOperations.cpp b/clang/lib/CodeGen/ObjectFilePCHContainerOperations.cpp index 8b40408f1ca..147d198d9b8 100644 --- a/clang/lib/CodeGen/ObjectFilePCHContainerOperations.cpp +++ b/clang/lib/CodeGen/ObjectFilePCHContainerOperations.cpp @@ -116,12 +116,12 @@ class PCHContainerGenerator : public ASTConsumer { }; public: - PCHContainerGenerator(DiagnosticsEngine &diags, const CompilerInstance &CI, - const std::string &MainFileName, + PCHContainerGenerator(CompilerInstance &CI, const std::string &MainFileName, const std::string &OutputFileName, raw_pwrite_stream *OS, std::shared_ptr<PCHBuffer> Buffer) - : Diags(diags), Ctx(nullptr), HeaderSearchOpts(CI.getHeaderSearchOpts()), + : Diags(CI.getDiagnostics()), Ctx(nullptr), + HeaderSearchOpts(CI.getHeaderSearchOpts()), PreprocessorOpts(CI.getPreprocessorOpts()), TargetOpts(CI.getTargetOpts()), LangOpts(CI.getLangOpts()), OS(OS), Buffer(Buffer) { @@ -252,10 +252,10 @@ public: std::unique_ptr<ASTConsumer> ObjectFilePCHContainerWriter::CreatePCHContainerGenerator( - DiagnosticsEngine &Diags, const CompilerInstance &CI, - const std::string &MainFileName, const std::string &OutputFileName, - llvm::raw_pwrite_stream *OS, std::shared_ptr<PCHBuffer> Buffer) const { - return llvm::make_unique<PCHContainerGenerator>(Diags, CI, MainFileName, + CompilerInstance &CI, const std::string &MainFileName, + const std::string &OutputFileName, llvm::raw_pwrite_stream *OS, + std::shared_ptr<PCHBuffer> Buffer) const { + return llvm::make_unique<PCHContainerGenerator>(CI, MainFileName, OutputFileName, OS, Buffer); } diff --git a/clang/lib/Frontend/FrontendActions.cpp b/clang/lib/Frontend/FrontendActions.cpp index be4ec5b1232..6ba4b134c38 100644 --- a/clang/lib/Frontend/FrontendActions.cpp +++ b/clang/lib/Frontend/FrontendActions.cpp @@ -93,7 +93,7 @@ GeneratePCHAction::CreateASTConsumer(CompilerInstance &CI, StringRef InFile) { Consumers.push_back(llvm::make_unique<PCHGenerator>( CI.getPreprocessor(), OutputFile, nullptr, Sysroot, Buffer)); Consumers.push_back(CI.getPCHContainerWriter().CreatePCHContainerGenerator( - CI.getDiagnostics(), CI, InFile, OutputFile, OS, Buffer)); + CI, InFile, OutputFile, OS, Buffer)); return llvm::make_unique<MultiplexConsumer>(std::move(Consumers)); } @@ -138,7 +138,7 @@ GenerateModuleAction::CreateASTConsumer(CompilerInstance &CI, /*AllowASTWithErrors*/false, /*IncludeTimestamps*/+CI.getFrontendOpts().BuildingImplicitModule)); Consumers.push_back(CI.getPCHContainerWriter().CreatePCHContainerGenerator( - CI.getDiagnostics(), CI, InFile, OutputFile, OS, Buffer)); + CI, InFile, OutputFile, OS, Buffer)); return llvm::make_unique<MultiplexConsumer>(std::move(Consumers)); } diff --git a/clang/lib/Frontend/PCHContainerOperations.cpp b/clang/lib/Frontend/PCHContainerOperations.cpp index 5cf8de44dca..5e1d7720509 100644 --- a/clang/lib/Frontend/PCHContainerOperations.cpp +++ b/clang/lib/Frontend/PCHContainerOperations.cpp @@ -48,9 +48,9 @@ public: } // anonymous namespace std::unique_ptr<ASTConsumer> RawPCHContainerWriter::CreatePCHContainerGenerator( - DiagnosticsEngine &Diags, const CompilerInstance &CI, - const std::string &MainFileName, const std::string &OutputFileName, - llvm::raw_pwrite_stream *OS, std::shared_ptr<PCHBuffer> Buffer) const { + CompilerInstance &CI, const std::string &MainFileName, + const std::string &OutputFileName, llvm::raw_pwrite_stream *OS, + std::shared_ptr<PCHBuffer> Buffer) const { return llvm::make_unique<RawPCHContainerGenerator>(OS, Buffer); } |
