From 92641dca867deff95707fe90d1590ea200fc4f7d Mon Sep 17 00:00:00 2001
From: Daniel Dunbar <daniel@zuster.org>
Date: Thu, 12 Nov 2009 02:53:13 +0000
Subject: [PATCH] Simplify.

llvm-svn: 86935
---
 clang/tools/clang-cc/clang-cc.cpp | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/clang/tools/clang-cc/clang-cc.cpp b/clang/tools/clang-cc/clang-cc.cpp
index 4f0fd5de45ca..2648a0b4d85f 100644
--- a/clang/tools/clang-cc/clang-cc.cpp
+++ b/clang/tools/clang-cc/clang-cc.cpp
@@ -718,6 +718,9 @@ static void ProcessInputFile(const CompilerInvocation &CompOpts,
   }
 
   llvm::OwningPtr<ASTContext> ContextOwner;
+  llvm::OwningPtr<ExternalASTSource> Source;
+  const std::string &ImplicitPCHInclude =
+    CompOpts.getPreprocessorOpts().getImplicitPCHInclude();
   if (Consumer)
     ContextOwner.reset(new ASTContext(PP.getLangOptions(),
                                       PP.getSourceManager(),
@@ -727,12 +730,6 @@ static void ProcessInputFile(const CompilerInvocation &CompOpts,
                                       PP.getBuiltinInfo(),
                                       /* FreeMemory = */ !DisableFree,
                                       /* size_reserve = */0));
-
-  llvm::OwningPtr<PCHReader> Reader;
-  llvm::OwningPtr<ExternalASTSource> Source;
-
-  const std::string &ImplicitPCHInclude =
-    CompOpts.getPreprocessorOpts().getImplicitPCHInclude();
   if (Consumer && !ImplicitPCHInclude.empty()) {
     // If the user specified -isysroot, it will be used for relocatable PCH
     // files.
@@ -740,6 +737,7 @@ static void ProcessInputFile(const CompilerInvocation &CompOpts,
     if (isysrootPCH[0] == '\0')
       isysrootPCH = 0;
 
+    llvm::OwningPtr<PCHReader> Reader;
     Reader.reset(new PCHReader(PP, ContextOwner.get(), isysrootPCH));
 
     // The user has asked us to include a precompiled header. Load
@@ -753,10 +751,8 @@ static void ProcessInputFile(const CompilerInvocation &CompOpts,
       // Attach the PCH reader to the AST context as an external AST
       // source, so that declarations will be deserialized from the
       // PCH file as needed.
-      if (ContextOwner) {
-        Source.reset(Reader.take());
-        ContextOwner->setExternalSource(Source);
-      }
+      Source.reset(Reader.take());
+      ContextOwner->setExternalSource(Source);
       break;
     }