2 files changed, 26 insertions, 0 deletions
diff --git a/clang/include/clang/AST/CFG.h b/clang/include/clang/AST/CFG.h
index 162240ab1f7..9f5d9d0e57a 100644
--- a/clang/include/clang/AST/CFG.h
+++ b/clang/include/clang/AST/CFG.h
@@ -158,6 +158,8 @@ public:
     return const_cast<CFGBlock*>(this)->getTerminatorCondition();
   }
   
+  bool hasBinaryBranchTerminator() const;
+  
   Stmt* getLabel() { return Label; }
   const Stmt* getLabel() const { return Label; }
   
diff --git a/clang/lib/AST/CFG.cpp b/clang/lib/AST/CFG.cpp
index aa5bbe437da..077f75c3848 100644
--- a/clang/lib/AST/CFG.cpp
+++ b/clang/lib/AST/CFG.cpp
@@ -1587,6 +1587,30 @@ Expr* CFGBlock::getTerminatorCondition() {
   return E ? E->IgnoreParens() : NULL;
 }
 
+bool CFGBlock::hasBinaryBranchTerminator() const {
+  
+  if (!Terminator)
+    return false;
+  
+  Expr* E = NULL;
+  
+  switch (Terminator->getStmtClass()) {
+    default:
+      return false;
+      
+    case Stmt::ForStmtClass:      
+    case Stmt::WhileStmtClass:
+    case Stmt::DoStmtClass:
+    case Stmt::IfStmtClass:
+    case Stmt::ChooseExprClass:
+    case Stmt::ConditionalOperatorClass:
+    case Stmt::BinaryOperatorClass:
+      return true;      
+  }
+  
+  return E ? E->IgnoreParens() : NULL;
+}
+
 
 //===----------------------------------------------------------------------===//
 // CFG Graphviz Visualization