intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-02-02 02:00:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

unique_ptrify ChainedDiagnosticConsumer's ctor parameters

Browse Source 
llvm-svn: 217793
This commit is contained in:
David Blaikie
2014-09-15 17:50:10 +00:00
parent 0290c9ca5c
commit 7ee25502f6
4 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
clang/include/clang/Frontend/ChainedDiagnosticConsumer.h
View File

@@ -26,11 +26,9 @@ class ChainedDiagnosticConsumer : public DiagnosticConsumer {
std::unique_ptr<DiagnosticConsumer> Secondary;
public:
ChainedDiagnosticConsumer(DiagnosticConsumer *_Primary,
DiagnosticConsumer *_Secondary) {
Primary.reset(_Primary);
Secondary.reset(_Secondary);
}
ChainedDiagnosticConsumer(std::unique_ptr<DiagnosticConsumer> Primary,
std::unique_ptr<DiagnosticConsumer> Secondary)
: Primary(std::move(Primary)), Secondary(std::move(Secondary)) {}
void BeginSourceFile(const LangOptions &LO,
const Preprocessor *PP) override {

4
clang/include/clang/Frontend/SerializedDiagnosticPrinter.h
View File

@@ -67,8 +67,8 @@ enum Level {
/// This allows wrapper tools for Clang to get diagnostics from Clang
/// (via libclang) without needing to parse Clang's command line output.
///
DiagnosticConsumer *create(std::unique_ptr<raw_ostream> OS,
DiagnosticOptions *diags);
std::unique_ptr<DiagnosticConsumer> create(std::unique_ptr<raw_ostream> OS,
DiagnosticOptions *diags);
} // end serialized_diags namespace
} // end clang namespace

17
clang/lib/Frontend/CompilerInstance.cpp
View File

@@ -154,11 +154,14 @@ static void SetUpDiagnosticLog(DiagnosticOptions *DiagOpts,
}
// Chain in the diagnostic client which will log the diagnostics.
LogDiagnosticPrinter *Logger =
new LogDiagnosticPrinter(*OS, DiagOpts, std::move(StreamOwner));
auto Logger = llvm::make_unique<LogDiagnosticPrinter>(*OS, DiagOpts,
std::move(StreamOwner));
if (CodeGenOpts)
Logger->setDwarfDebugFlags(CodeGenOpts->DwarfDebugFlags);
Diags.setClient(new ChainedDiagnosticConsumer(Diags.takeClient(), Logger));
assert(Diags.ownsClient());
Diags.setClient(new ChainedDiagnosticConsumer(
std::unique_ptr<DiagnosticConsumer>(Diags.takeClient()),
std::move(Logger)));
}
static void SetupSerializedDiagnostics(DiagnosticOptions *DiagOpts,
@@ -174,11 +177,13 @@ static void SetupSerializedDiagnostics(DiagnosticOptions *DiagOpts,
return;
}
DiagnosticConsumer *SerializedConsumer =
auto SerializedConsumer =
clang::serialized_diags::create(std::move(OS), DiagOpts);
Diags.setClient(new ChainedDiagnosticConsumer(Diags.takeClient(),
SerializedConsumer));
assert(Diags.ownsClient());
Diags.setClient(new ChainedDiagnosticConsumer(
std::unique_ptr<DiagnosticConsumer>(Diags.takeClient()),
std::move(SerializedConsumer)));
}
void CompilerInstance::createDiagnostics(DiagnosticConsumer *Client,

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

@@ -236,9 +236,9 @@ private:
namespace clang {
namespace serialized_diags {
DiagnosticConsumer *create(std::unique_ptr<raw_ostream> OS,
DiagnosticOptions *diags) {
return new SDiagsWriter(std::move(OS), diags);
std::unique_ptr<DiagnosticConsumer> create(std::unique_ptr<raw_ostream> OS,
DiagnosticOptions *diags) {
return llvm::make_unique<SDiagsWriter>(std::move(OS), diags);
}
} // end namespace serialized_diags
} // end namespace clang