commit 5262fda30b876c8aae95f2eb92e349418d6b14bb
author Daniel Dunbar <daniel@zuster.org> Thu Dec 03 01:45:44 2009 +0000
committer Daniel Dunbar <daniel@zuster.org> Thu Dec 03 01:45:44 2009 +0000
tree 258af401a1fdf30edb4079efece5a40e0ed3551d
parent 7d9bd4257f817494b2fa5b310df05807050a9c18

Fix ASTUnit to allows require a (persistent) Diagnostic object be provided; propogate and simplify.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@90379 91177308-0d34-0410-b5e6-96231b3b80d8

tools/CIndex/CIndex.cpp

diff --git a/tools/CIndex/CIndex.cpp b/tools/CIndex/CIndex.cpp
index 87d7856..a5b7e99 100644
--- a/tools/CIndex/CIndex.cpp
+++ b/tools/CIndex/CIndex.cpp
@@ -23,6 +23,7 @@
 #include "clang/Basic/FileManager.h"
 #include "clang/Basic/SourceManager.h"
 #include "clang/Frontend/ASTUnit.h"
+#include "clang/Frontend/CompilerInstance.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/Config/config.h"
 #include "llvm/Support/Compiler.h"
@@ -291,10 +292,24 @@
 };
 
 class CIndexer : public Indexer {
+  IgnoreDiagnosticsClient IgnoreDiagClient;
+  llvm::OwningPtr<Diagnostic> TextDiags;
+  Diagnostic IgnoreDiags;
+  bool UseExternalASTGeneration;
+  bool OnlyLocalDecls;
+  bool DisplayDiagnostics;
+
+  llvm::sys::Path ClangPath;
+
 public:
   explicit CIndexer(Program *prog) : Indexer(*prog),
+                                     IgnoreDiags(&IgnoreDiagClient),
+                                     UseExternalASTGeneration(false),
                                      OnlyLocalDecls(false),
-                                     DisplayDiagnostics(false) {}
+                                     DisplayDiagnostics(false) {
+    TextDiags.reset(
+      CompilerInstance::createDiagnostics(DiagnosticOptions(), 0, 0));
+  }
 
   virtual ~CIndexer() { delete &getProgram(); }
 
@@ -304,18 +319,17 @@
   bool getOnlyLocalDecls() const { return OnlyLocalDecls; }
   void setOnlyLocalDecls(bool Local = true) { OnlyLocalDecls = Local; }
 
+  bool getDisplayDiagnostics() const { return DisplayDiagnostics; }
   void setDisplayDiagnostics(bool Display = true) {
     DisplayDiagnostics = Display;
   }
-  bool getDisplayDiagnostics() const { return DisplayDiagnostics; }
+
+  Diagnostic &getDiags() {
+    return DisplayDiagnostics ? *TextDiags : IgnoreDiags;
+  }
 
   /// \brief Get the path of the clang binary.
   const llvm::sys::Path& getClangPath();
-private:
-  bool OnlyLocalDecls;
-  bool DisplayDiagnostics;
-
-  llvm::sys::Path ClangPath;
 };
 
 const llvm::sys::Path& CIndexer::getClangPath() {
@@ -457,20 +471,10 @@
                                               const char *ast_filename) {
   assert(CIdx && "Passed null CXIndex");
   CIndexer *CXXIdx = static_cast<CIndexer *>(CIdx);
-  std::string astName(ast_filename);
-  std::string ErrMsg;
 
-  CXTranslationUnit TU =
-    ASTUnit::LoadFromPCHFile(astName, &ErrMsg,
-                             CXXIdx->getDisplayDiagnostics() ?
-                             NULL : new IgnoreDiagnosticsClient(),
-                             CXXIdx->getOnlyLocalDecls(),
-                             /* UseBumpAllocator = */ true);
-
-  if (CXXIdx->getDisplayDiagnostics() && !ErrMsg.empty())
-    llvm::errs() << "clang_createTranslationUnit: " << ErrMsg  << '\n';
-
-  return TU;
+  return ASTUnit::LoadFromPCHFile(ast_filename, CXXIdx->getDiags(),
+                                  CXXIdx->getOnlyLocalDecls(),
+                                  /* UseBumpAllocator = */ true);
 }
 
 CXTranslationUnit