Explicitly handle CXXOperatorCallExpr when building CFGs. We should treat it the same as CallExprs.

Fixes: <rdar://problem/8375510> [Boost] CFGBuilder crash in Boost.Graph
llvm-svn: 112618

2 files changed, 13 insertions, 1 deletions

diff --git a/clang/lib/Analysis/CFG.cpp b/clang/lib/Analysis/CFG.cpp
index 78979a4feeb..562763b8b45 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:
       return VisitCallExpr(cast<CallExpr>(S), asc);
 
     case Stmt::CaseStmtClass:
@@ -393,7 +394,7 @@ tryAgain:
     case Stmt::CXXExprWithTemporariesClass: {
       // FIXME: Handle temporaries.  For now, just visit the subexpression
       // so we don't artificially create extra blocks.
-      return Visit(cast<CXXExprWithTemporaries>(S)->getSubExpr());    
+      return Visit(cast<CXXExprWithTemporaries>(S)->getSubExpr(), asc);
     }
 
     case Stmt::CXXMemberCallExprClass:
diff --git a/clang/test/Analysis/misc-ps-region-store.cpp b/clang/test/Analysis/misc-ps-region-store.cpp
index baaa2f6cbd0..bfa5e5cbb9b 100644
--- a/clang/test/Analysis/misc-ps-region-store.cpp
+++ b/clang/test/Analysis/misc-ps-region-store.cpp
@@ -148,3 +148,14 @@ void pr7675_test() {
   *p = 0xDEADBEEF; // expected-warning{{null pointer}}
 }
 
+// <rdar://problem/8375510> - CFGBuilder should handle temporaries.
+struct R8375510 {
+  R8375510();
+  ~R8375510();
+  R8375510 operator++(int);
+};
+
+int r8375510(R8375510 x, R8375510 y) {
+  for (; ; x++) { }
+}
+