Remove some if-0'd code, we can resurrect this if we ever decide to support

continuing after invalid PCH loads.

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

diff --git a/tools/clang-cc/clang-cc.cpp b/tools/clang-cc/clang-cc.cpp
index ba654fdc9d7896fafe4bb15fe4571ab2fe1ead29..33f7465fa9c6983119bd4178717edb7faa486e68 100644 (file)
--- a/tools/clang-cc/clang-cc.cpp
+++ b/tools/clang-cc/clang-cc.cpp
@@ -1936,17 +1936,6 @@ static void ProcessInputFile(const CompilerInvocation &CompOpts,
     case PCHReader::IgnorePCH:
       // No suitable PCH file could be found. Return an error.
       return;
-
-#if 0
-      // FIXME: We can recover from failed attempts to load PCH
-      // files. This code will do so, if we ever want to enable it.
-
-      // We delayed the initialization of builtins in the hope of
-      // loading the PCH file. Since the PCH file could not be
-      // loaded, initialize builtins now.
-      if (ContextOwner)
-        ContextOwner->InitializeBuiltins(PP.getIdentifierTable());
-#endif
     }
 
     // Finish preprocessor initialization. We do this now (rather
@@ -2381,7 +2370,7 @@ int main(int argc, char **argv) {
     HeaderInfo.ClearFileInfo();
   }
 
-  if (!NoCaretDiagnostics)
+  if (CompOpts.getDiagnosticOpts().ShowCarets)
     if (unsigned NumDiagnostics = Diags.getNumDiagnostics())
       fprintf(stderr, "%d diagnostic%s generated.\n", NumDiagnostics,
               (NumDiagnostics == 1 ? "" : "s"));