clang-cc: Unify InitializeSourceManager calls.

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

diff --git a/tools/clang-cc/clang-cc.cpp b/tools/clang-cc/clang-cc.cpp
index f6b38dfe1544536fdabc9734f6b0338b6ba2b6ed..4f0fd5de45ca2dcc15550249efaa3f0e3e69e305 100644 (file)
--- a/tools/clang-cc/clang-cc.cpp
+++ b/tools/clang-cc/clang-cc.cpp
@@ -717,7 +717,6 @@ static void ProcessInputFile(const CompilerInvocation &CompOpts,
     }
   }
 
-
   llvm::OwningPtr<ASTContext> ContextOwner;
   if (Consumer)
     ContextOwner.reset(new ASTContext(PP.getLangOptions(),
@@ -770,27 +769,18 @@ static void ProcessInputFile(const CompilerInvocation &CompOpts,
       // No suitable PCH file could be found. Return an error.
       return;
     }
-
-    // Finish preprocessor initialization. We do this now (rather
-    // than earlier) because this initialization creates new source
-    // location entries in the source manager, which must come after
-    // the source location entries for the PCH file.
-    if (InitializeSourceManager(PP, InFile))
-      return;
-  } else if (!ImplicitPCHInclude.empty()) {
-    // If we have an implicit PCH, the source manager initialization was
-    // delayed, do it now.
-    //
-    // FIXME: Clean this up.
-
-    // Finish preprocessor initialization. We do this now (rather
-    // than earlier) because this initialization creates new source
-    // location entries in the source manager, which must come after
-    // the source location entries for the PCH file.
-    if (InitializeSourceManager(PP, InFile))
-      return;
   }
 
+  // Initialize the main file entry. This needs to be delayed until after PCH
+  // has loaded.
+  if (InitializeSourceManager(PP, InFile))
+    return;
+
+  // Initialize builtin info unless we are using PCH.
+  if (!Consumer || ImplicitPCHInclude.empty())
+    PP.getBuiltinInfo().InitializeBuiltins(PP.getIdentifierTable(),
+                                           PP.getLangOptions().NoBuiltin);
+
   // If we have an ASTConsumer, run the parser with it.
   if (Consumer) {
     CodeCompleteConsumer *(*CreateCodeCompleter)(Sema &, void *) = 0;
@@ -1232,15 +1222,6 @@ int main(int argc, char **argv) {
                             CompOpts.getDependencyOutputOpts(),
                             *Target, SourceMgr, FileMgr));
 
-    if (CompOpts.getPreprocessorOpts().getImplicitPCHInclude().empty()) {
-      if (InitializeSourceManager(*PP.get(), InFile))
-        continue;
-
-      // Initialize builtin info.
-      PP->getBuiltinInfo().InitializeBuiltins(PP->getIdentifierTable(),
-                                              PP->getLangOptions().NoBuiltin);
-    }
-
     // Process the source file.
     Diags.getClient()->BeginSourceFile(CompOpts.getLangOpts());
     ProcessInputFile(CompOpts, *PP, InFile, ProgAction, Context);