commit 8835e03cee62306e877829592f9aae52361f9028
author Douglas Gregor <dgregor@apple.com> Fri Sep 02 00:26:20 2011 +0000
committer Douglas Gregor <dgregor@apple.com> Fri Sep 02 00:26:20 2011 +0000
tree 4133beeb873f95bf83c4ba24f43ae5d268fa7aa4
parent e8bbc121528b08157bf7457dada4bc87315a2c18

Always construct an ASTReader with a non-NULL ASTContext and
Preprocessor, eliminating the constructor that was used by ASTUnit
(which didn't provide an ASTContext or Prepreprocessor). Ensuring that
both objects are non-NULL will simplify module loading (but none of
that is done yet).

llvm-svn: 138986

clang/lib/Frontend/CompilerInstance.cpp

diff --git a/clang/lib/Frontend/CompilerInstance.cpp b/clang/lib/Frontend/CompilerInstance.cpp
index 2252cd6..bd019e0 100644
--- a/clang/lib/Frontend/CompilerInstance.cpp
+++ b/clang/lib/Frontend/CompilerInstance.cpp
@@ -273,7 +273,7 @@
                                              void *DeserializationListener,
                                              bool Preamble) {
   llvm::OwningPtr<ASTReader> Reader;
-  Reader.reset(new ASTReader(PP, &Context,
+  Reader.reset(new ASTReader(PP, Context,
                              Sysroot.empty() ? "" : Sysroot.c_str(),
                              DisablePCHValidation, DisableStatCache));
 
@@ -655,7 +655,7 @@
   if (!ModuleManager) {
     std::string Sysroot = getHeaderSearchOpts().Sysroot;
     const PreprocessorOptions &PPOpts = getPreprocessorOpts();
-    ModuleManager = new ASTReader(getPreprocessor(), &*Context,
+    ModuleManager = new ASTReader(getPreprocessor(), *Context,
                                   Sysroot.empty() ? "" : Sysroot.c_str(),
                                   PPOpts.DisablePCHValidation, 
                                   PPOpts.DisableStatCache);