2 files changed, 20 insertions, 0 deletions
diff --git a/lib/StaticAnalyzer/Core/AggExprVisitor.cpp b/lib/StaticAnalyzer/Core/AggExprVisitor.cpp
index 9804163d9e..e80cf9b4a3 100644
--- a/lib/StaticAnalyzer/Core/AggExprVisitor.cpp
+++ b/lib/StaticAnalyzer/Core/AggExprVisitor.cpp
@@ -39,6 +39,7 @@ public:
 
   void VisitCastExpr(CastExpr *E);
   void VisitCXXConstructExpr(CXXConstructExpr *E);
+  void VisitCXXMemberCallExpr(CXXMemberCallExpr *E);
 };
 }
 
@@ -48,6 +49,7 @@ void AggExprVisitor::VisitCastExpr(CastExpr *E) {
     assert(0 && "Unhandled cast kind");
   case CK_NoOp:
   case CK_ConstructorConversion:
+  case CK_UserDefinedConversion:
     Visit(E->getSubExpr());
     break;
   }
@@ -57,6 +59,10 @@ void AggExprVisitor::VisitCXXConstructExpr(CXXConstructExpr *E) {
   Eng.VisitCXXConstructExpr(E, Dest, Pred, DstSet);
 }
 
+void AggExprVisitor::VisitCXXMemberCallExpr(CXXMemberCallExpr *E) {
+  Eng.VisitCXXMemberCallExpr(E, Pred, DstSet);
+}
+
 void ExprEngine::VisitAggExpr(const Expr *E, const MemRegion *Dest, 
                                 ExplodedNode *Pred, ExplodedNodeSet &Dst) {
   AggExprVisitor(Dest, Pred, Dst, *this).Visit(const_cast<Expr *>(E));
diff --git a/test/Analysis/cxx-crashes.cpp b/test/Analysis/cxx-crashes.cpp
index 720850cc5c..db2298df89 100644
--- a/test/Analysis/cxx-crashes.cpp
+++ b/test/Analysis/cxx-crashes.cpp
@@ -5,3 +5,17 @@ int f1(char *dst) {
   char *q = dst + 3;
   return !(q >= p);
 }
+
+namespace {
+
+struct A { };
+struct B {
+  operator A();
+};
+
+A f(char *dst) {
+  B b;
+  return b;
+}
+
+}