The constructor for ASTUnit now takes a DiagnosticClient*, allowing uses of ASTUnit to specify
alternate DiagnosticClients. To match this API, ASTUnit::LoadFromPCHFile() now takes a corresponding
DiagnosticClient* argument as well. The DiagnosticClient object is destroyed when the ASTUnit object
is destroyed.
The CIndex library now uses this API to create a 'IgnoreDiagnosticsClient' that simply silences
diagnostics when using the clang_createTranslationUnitFromSourceFile() function. This fixes
<rdar://problem/7312058>. This API can change in the future as we add more flexibility for clients.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@84539 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Frontend/ASTUnit.cpp b/lib/Frontend/ASTUnit.cpp
index a7a62fb..c0415bf 100644
--- a/lib/Frontend/ASTUnit.cpp
+++ b/lib/Frontend/ASTUnit.cpp
@@ -25,12 +25,15 @@
using namespace clang;
-ASTUnit::ASTUnit() : tempFile(false) {
- Diags.setClient(&DiagClient);
+ASTUnit::ASTUnit(DiagnosticClient *diagClient) : tempFile(false) {
+ Diags.setClient(diagClient ? diagClient : new TextDiagnosticBuffer());
}
ASTUnit::~ASTUnit() {
if (tempFile)
llvm::sys::Path(getPCHFileName()).eraseFromDisk();
+
+ // The ASTUnit object owns the DiagnosticClient.
+ delete Diags.getClient();
}
namespace {
@@ -92,9 +95,10 @@
ASTUnit *ASTUnit::LoadFromPCHFile(const std::string &Filename,
std::string *ErrMsg,
+ DiagnosticClient *diagClient,
bool OnlyLocalDecls,
bool UseBumpAllocator) {
- llvm::OwningPtr<ASTUnit> AST(new ASTUnit());
+ llvm::OwningPtr<ASTUnit> AST(new ASTUnit(diagClient));
AST->OnlyLocalDecls = OnlyLocalDecls;
AST->HeaderInfo.reset(new HeaderSearch(AST->getFileManager()));
@@ -109,7 +113,8 @@
llvm::OwningPtr<PCHReader> Reader;
llvm::OwningPtr<ExternalASTSource> Source;
- Reader.reset(new PCHReader(AST->getSourceManager(), AST->getFileManager(), AST->Diags));
+ Reader.reset(new PCHReader(AST->getSourceManager(), AST->getFileManager(),
+ AST->Diags));
Reader->setListener(new PCHInfoCollector(LangInfo, HeaderInfo, TargetTriple,
Predefines, Counter));