[cfe-commits] r86631 - /cfe/trunk/tools/clang-cc/clang-cc.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Mon Nov  9 18:46:12 2009
New Revision: 86631

URL: http://llvm.org/viewvc/llvm-project?rev=86631&view=rev
Log:
Remove some if-0'd code, we can resurrect this if we ever decide to support
continuing after invalid PCH loads.

Modified:
    cfe/trunk/tools/clang-cc/clang-cc.cpp

Modified: cfe/trunk/tools/clang-cc/clang-cc.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-cc/clang-cc.cpp?rev=86631&r1=86630&r2=86631&view=diff

==============================================================================
--- cfe/trunk/tools/clang-cc/clang-cc.cpp (original)
+++ cfe/trunk/tools/clang-cc/clang-cc.cpp Mon Nov  9 18:46:12 2009
@@ -1936,17 +1936,6 @@
     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 @@
     HeaderInfo.ClearFileInfo();
   }
 
-  if (!NoCaretDiagnostics)
+  if (CompOpts.getDiagnosticOpts().ShowCarets)
     if (unsigned NumDiagnostics = Diags.getNumDiagnostics())
       fprintf(stderr, "%d diagnostic%s generated.\n", NumDiagnostics,
               (NumDiagnostics == 1 ? "" : "s"));