1 files changed, 11 insertions, 5 deletions
diff --git a/lib/Frontend/CompilerInstance.cpp b/lib/Frontend/CompilerInstance.cpp
index 9a679eed24..9087ab58d6 100644
--- a/lib/Frontend/CompilerInstance.cpp
+++ b/lib/Frontend/CompilerInstance.cpp
@@ -736,20 +736,26 @@ ModuleKey CompilerInstance::loadModule(SourceLocation ImportLoc,
   
   // If we don't already have an ASTReader, create one now.
   if (!ModuleManager) {
+    if (!hasASTContext())
+      createASTContext();
+
     std::string Sysroot = getHeaderSearchOpts().Sysroot;
     const PreprocessorOptions &PPOpts = getPreprocessorOpts();
     ModuleManager = new ASTReader(getPreprocessor(), *Context,
                                   Sysroot.empty() ? "" : Sysroot.c_str(),
                                   PPOpts.DisablePCHValidation, 
                                   PPOpts.DisableStatCache);
-    ModuleManager->setDeserializationListener(
-      getASTConsumer().GetASTDeserializationListener());
-    getASTContext().setASTMutationListener(
-      getASTConsumer().GetASTMutationListener());
+    if (hasASTConsumer()) {
+      ModuleManager->setDeserializationListener(
+        getASTConsumer().GetASTDeserializationListener());
+      getASTContext().setASTMutationListener(
+        getASTConsumer().GetASTMutationListener());
+    }
     llvm::OwningPtr<ExternalASTSource> Source;
     Source.reset(ModuleManager);
     getASTContext().setExternalSource(Source);
-    ModuleManager->InitializeSema(getSema());
+    if (hasSema())
+      ModuleManager->InitializeSema(getSema());
   }
   
   // Try to load the module we found.