replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Further simplify the interface of PCHContainerGenerator 

by dropping the const qualifier on the CI.

NFC

llvm-svn: 248101
This commit is contained in:
Adrian Prantl 2015-09-19 21:42:52 +00:00
parent fb80f961df
commit 1e63b2bdc3
5 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/include/clang/CodeGen/ObjectFilePCHContainerOperations.h
View File

@ -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;
};

11
clang/include/clang/Frontend/PCHContainerOperations.h
View File

@ -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;
};

14
clang/lib/CodeGen/ObjectFilePCHContainerOperations.cpp
View File

@ -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);
}

4
clang/lib/Frontend/FrontendActions.cpp
View File

@ -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));
}

6
clang/lib/Frontend/PCHContainerOperations.cpp
View File

@ -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);
}