Author: adrian
Date: Sat Sep 19 16:42:52 2015
New Revision: 248101
URL: http://llvm.org/viewvc/llvm-project?rev=248101&view=rev
Log:
Further simplify the interface of PCHContainerGenerator
by dropping the const qualifier on the CI.
NFC
Modified:
cfe/trunk/include/clang/CodeGen/ObjectFilePCHContainerOperations.h
cfe/trunk/include/clang/Frontend/PCHContainerOperations.h
cfe/trunk/lib/CodeGen/ObjectFilePCHContainerOperations.cpp
cfe/trunk/lib/Frontend/FrontendActions.cpp
cfe/trunk/lib/Frontend/PCHContainerOperations.cpp
Modified: cfe/trunk/include/clang/CodeGen/ObjectFilePCHContainerOperations.h
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/CodeGen/ObjectFilePCHContainerOperations.h?rev=248101&r1=248100&r2=248101&view=diff
==============================================================================
--- cfe/trunk/include/clang/CodeGen/ObjectFilePCHContainerOperations.h
(original)
+++ cfe/trunk/include/clang/CodeGen/ObjectFilePCHContainerOperations.h Sat Sep
19 16:42:52 2015
@@ -23,9 +23,8 @@ class ObjectFilePCHContainerWriter : pub
/// 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;
};
Modified: cfe/trunk/include/clang/Frontend/PCHContainerOperations.h
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/PCHContainerOperations.h?rev=248101&r1=248100&r2=248101&view=diff
==============================================================================
--- cfe/trunk/include/clang/Frontend/PCHContainerOperations.h (original)
+++ cfe/trunk/include/clang/Frontend/PCHContainerOperations.h Sat Sep 19
16:42:52 2015
@@ -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 PCH
/// 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;
};
Modified: cfe/trunk/lib/CodeGen/ObjectFilePCHContainerOperations.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/ObjectFilePCHContainerOperations.cpp?rev=248101&r1=248100&r2=248101&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/ObjectFilePCHContainerOperations.cpp (original)
+++ cfe/trunk/lib/CodeGen/ObjectFilePCHContainerOperations.cpp Sat Sep 19
16:42:52 2015
@@ -116,12 +116,12 @@ class PCHContainerGenerator : public AST
};
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);
}
Modified: cfe/trunk/lib/Frontend/FrontendActions.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/FrontendActions.cpp?rev=248101&r1=248100&r2=248101&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/FrontendActions.cpp (original)
+++ cfe/trunk/lib/Frontend/FrontendActions.cpp Sat Sep 19 16:42:52 2015
@@ -93,7 +93,7 @@ GeneratePCHAction::CreateASTConsumer(Com
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(
/*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));
}
Modified: cfe/trunk/lib/Frontend/PCHContainerOperations.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/PCHContainerOperations.cpp?rev=248101&r1=248100&r2=248101&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/PCHContainerOperations.cpp (original)
+++ cfe/trunk/lib/Frontend/PCHContainerOperations.cpp Sat Sep 19 16:42:52 2015
@@ -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);
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
