Update clang to r84949.

1 files changed, 6 insertions, 16 deletions

diff --git a/lib/Analysis/CFG.cpp b/lib/Analysis/CFG.cpp
index 7b1d50c..3141759 100644
--- a/lib/Analysis/CFG.cpp
+++ b/lib/Analysis/CFG.cpp
@@ -22,6 +22,7 @@
 #include "llvm/Support/Format.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/SmallPtrSet.h"
+#include "llvm/ADT/OwningPtr.h"
 
 using namespace clang;
 
@@ -51,7 +52,7 @@ static SourceLocation GetEndLoc(Decl* D) {
 ///
 class VISIBILITY_HIDDEN CFGBuilder {
   ASTContext *Context;
-  CFG* cfg;
+  llvm::OwningPtr<CFG> cfg;
 
   CFGBlock* Block;
   CFGBlock* Succ;
@@ -79,8 +80,6 @@ public:
                           ContinueTargetBlock(NULL), BreakTargetBlock(NULL),
                           SwitchTerminatedBlock(NULL), DefaultCaseBlock(NULL) {}
 
-  ~CFGBuilder() { delete cfg; }
-
   // buildCFG - Used by external clients to construct the CFG.
   CFG* buildCFG(Stmt *Statement, ASTContext *C);
 
@@ -195,7 +194,7 @@ static VariableArrayType* FindVA(Type* t) {
 ///  NULL.
 CFG* CFGBuilder::buildCFG(Stmt* Statement, ASTContext* C) {
   Context = C;
-  assert(cfg);
+  assert(cfg.get());
   if (!Statement)
     return NULL;
 
@@ -210,7 +209,8 @@ CFG* CFGBuilder::buildCFG(Stmt* Statement, ASTContext* C) {
 
   // Visit the statements and create the CFG.
   CFGBlock* B = addStmt(Statement);
-  if (!B) B = Succ;
+  if (!B)
+    B = Succ;
 
   if (B) {
     // Finalize the last constructed block.  This usually involves reversing the
@@ -254,17 +254,7 @@ CFG* CFGBuilder::buildCFG(Stmt* Statement, ASTContext* C) {
   // Create an empty entry block that has no predecessors.
   cfg->setEntry(createBlock());
 
-  if (badCFG) {
-    delete cfg;
-    cfg = NULL;
-    return NULL;
-  }
-
-  // NULL out cfg so that repeated calls to the builder will fail and that the
-  // ownership of the constructed CFG is passed to the caller.
-  CFG* t = cfg;
-  cfg = NULL;
-  return t;
+  return badCFG ? NULL : cfg.take();
 }
 
 /// createBlock - Used to lazily create blocks that are connected