commit 4422bfea50d1ef2256bd6a996bbe83793d45e0c1
author Ted Kremenek <kremenek@apple.com> Fri Mar 18 02:06:56 2011 +0000
committer Ted Kremenek <kremenek@apple.com> Fri Mar 18 02:06:56 2011 +0000
tree 979cbb76437801a5a84b77d28c032f73c34c6a74
parent 750028b6f4cc5d3c3a3821efb0a5f66d7071f254

Use CrashRecoveryContextCleanup objects to recover an ASTUnit if we crash in ASTUnit::LoadFromCommandLine() and ASTUnit::LoadFromCompilerInvocation().

llvm-svn: 127851

clang/lib/Frontend/ASTUnit.cpp

diff --git a/clang/lib/Frontend/ASTUnit.cpp b/clang/lib/Frontend/ASTUnit.cpp
index 41f2442..3eb418c 100644
--- a/clang/lib/Frontend/ASTUnit.cpp
+++ b/clang/lib/Frontend/ASTUnit.cpp
@@ -44,6 +44,7 @@
 #include "llvm/Support/Path.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Support/Timer.h"
+#include "llvm/Support/CrashRecoveryContext.h"
 #include <cstdlib>
 #include <cstdio>
 #include <sys/stat.h>
@@ -500,6 +501,12 @@
                                   unsigned NumRemappedFiles,
                                   bool CaptureDiagnostics) {
   llvm::OwningPtr<ASTUnit> AST(new ASTUnit(true));
+
+  // Recover resources if we crash before exiting this method.
+  llvm::CrashRecoveryContextCleanupRegistrar
+    ASTUnitCleanup(llvm::CrashRecoveryContextCleanup::
+                    create<ASTUnit>(AST.get()));
+
   ConfigureDiags(Diags, 0, 0, *AST, CaptureDiagnostics);
 
   AST->OnlyLocalDecls = OnlyLocalDecls;
@@ -1579,6 +1586,11 @@
   AST->ShouldCacheCodeCompletionResults = CacheCodeCompletionResults;
   AST->Invocation.reset(CI);
   
+  // Recover resources if we crash before exiting this method.
+  llvm::CrashRecoveryContextCleanupRegistrar
+    ASTUnitCleanup(llvm::CrashRecoveryContextCleanup::
+                   create<ASTUnit>(AST.get()));
+
   return AST->LoadFromCompilerInvocation(PrecompilePreamble)? 0 : AST.take();
 }
 
@@ -1704,6 +1716,12 @@
   AST->NumStoredDiagnosticsInPreamble = StoredDiagnostics.size();
   AST->StoredDiagnostics.swap(StoredDiagnostics);
   AST->Invocation.reset(CI.take());
+  
+  // Recover resources if we crash before exiting this method.
+  llvm::CrashRecoveryContextCleanupRegistrar
+    ASTUnitCleanup(llvm::CrashRecoveryContextCleanup::
+                    create<ASTUnit>(AST.get()));
+
   return AST->LoadFromCompilerInvocation(PrecompilePreamble) ? 0 : AST.take();
 }