[cfe-commits] r125204 - /cfe/trunk/lib/Frontend/FrontendAction.cpp

[Douglas Gregor]

Author: dgregor
Date: Wed Feb  9 12:47:31 2011
New Revision: 125204

URL: http://llvm.org/viewvc/llvm-project?rev=125204&view=rev
Log:
Finish up the diagnostic client before we've torn down the ASTReader,
since the diagnostic client might poke at source locations that have
not yet been deserialized.

Modified:
    cfe/trunk/lib/Frontend/FrontendAction.cpp

Modified: cfe/trunk/lib/Frontend/FrontendAction.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/FrontendAction.cpp?rev=125204&r1=125203&r2=125204&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/FrontendAction.cpp (original)
+++ cfe/trunk/lib/Frontend/FrontendAction.cpp Wed Feb  9 12:47:31 2011
@@ -290,6 +290,9 @@
 void FrontendAction::EndSourceFile() {
   CompilerInstance &CI = getCompilerInstance();
 
+  // Inform the diagnostic client we are done with this source file.
+  CI.getDiagnosticClient().EndSourceFile();
+
   // Finalize the action.
   EndSourceFileAction();
 
@@ -328,9 +331,6 @@
   // an error.
   CI.clearOutputFiles(/*EraseFiles=*/CI.getDiagnostics().hasErrorOccurred());
 
-  // Inform the diagnostic client we are done with this source file.
-  CI.getDiagnosticClient().EndSourceFile();
-
   if (isCurrentFileAST()) {
     CI.takeSema();
     CI.takeASTContext();