Teach the CFGBuilder not do die on CXXBindTemporaryExpr, CXXOperatorCallExpr. Fixes a Boost.Graph crasher.

llvm-svn: 112578

2 files changed, 20 insertions, 0 deletions

diff --git a/clang/lib/Analysis/CFG.cpp b/clang/lib/Analysis/CFG.cpp
index 78979a4feeb..ea30ec01f6e 100644
--- a/clang/lib/Analysis/CFG.cpp
+++ b/clang/lib/Analysis/CFG.cpp
@@ -370,6 +370,7 @@ tryAgain:
       return VisitBreakStmt(cast<BreakStmt>(S));
 
     case Stmt::CallExprClass:
+    case Stmt::CXXOperatorCallExprClass: // FIXME: handle specially?
       return VisitCallExpr(cast<CallExpr>(S), asc);
 
     case Stmt::CaseStmtClass:
@@ -396,6 +397,12 @@ tryAgain:
       return Visit(cast<CXXExprWithTemporaries>(S)->getSubExpr());    
     }
 
+    case Stmt::CXXBindTemporaryExprClass: {
+      // FIXME: Handle temporary binding.  For now, just visit the subexpression
+      // so we don't artificially create extra blocks.
+      return Visit(cast<CXXBindTemporaryExpr>(S)->getSubExpr());    
+    }
+
     case Stmt::CXXMemberCallExprClass:
       return VisitCXXMemberCallExpr(cast<CXXMemberCallExpr>(S), asc);
 
diff --git a/clang/test/Analysis/temporaries.cpp b/clang/test/Analysis/temporaries.cpp
new file mode 100644
index 00000000000..602948af5c8
--- /dev/null
+++ b/clang/test/Analysis/temporaries.cpp
@@ -0,0 +1,13 @@
+// // RUN: %clang_cc1 -analyze -analyzer-check-objc-mem -analyzer-inline-call -analyzer-store region -verify %s
+ 
+// FIXME: Super-simple test to make sure we don't die on temporaries.
+
+struct X {
+  X();
+  ~X();
+  X operator++(int);
+};
+
+int f(X x, X y) {
+  for (; ; x++) { }
+}