2 files changed, 3 insertions, 8 deletions
diff --git a/include/clang/StaticAnalyzer/PathSensitive/CheckerVisitor.def b/include/clang/StaticAnalyzer/PathSensitive/CheckerVisitor.def
index 3ee8071985..f5673c804e 100644
--- a/include/clang/StaticAnalyzer/PathSensitive/CheckerVisitor.def
+++ b/include/clang/StaticAnalyzer/PathSensitive/CheckerVisitor.def
@@ -22,10 +22,12 @@
 PREVISIT(ArraySubscriptExpr, Stmt)
 PREVISIT(BinaryOperator, Stmt)
 PREVISIT(CallExpr, GenericCall)
+PREVISIT(CompoundAssignOperator, BinaryOperator)
 PREVISIT(CStyleCastExpr, CastExpr)
 PREVISIT(CXXFunctionalCastExpr, CastExpr)
 PREVISIT(CXXOperatorCallExpr, GenericCall)
 PREVISIT(CXXMemberCallExpr, GenericCall)
+PREVISIT(CXXStaticCastExpr, CastExpr)
 PREVISIT(DeclStmt, Stmt)
 PREVISIT(ImplicitCastExpr, CastExpr)
 PREVISIT(ObjCAtSynchronizedStmt, Stmt)
@@ -35,6 +37,7 @@ PREVISIT(ReturnStmt, Stmt)
 POSTVISIT(BlockExpr, Stmt)
 POSTVISIT(BinaryOperator, Stmt)
 POSTVISIT(CallExpr, GenericCall)
+POSTVISIT(CompoundAssignOperator, BinaryOperator)
 POSTVISIT(CXXOperatorCallExpr, GenericCall)
 POSTVISIT(CXXMemberCallExpr, GenericCall)
 POSTVISIT(ObjCMessageExpr, Stmt)
diff --git a/include/clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h b/include/clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h
index 68677f5503..c08560a2b0 100644
--- a/include/clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h
+++ b/include/clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h
@@ -42,10 +42,6 @@ public:
       default:
         assert(false && "Unsupport statement.");
         return;
-      case Stmt::CompoundAssignOperatorClass:
-        static_cast<ImplClass*>(this)->PreVisitBinaryOperator(C,
-                                         static_cast<const BinaryOperator*>(S));
-        break;
 
 #define PREVISIT(NAME, FALLBACK) \
 case Stmt::NAME ## Class:\
@@ -60,10 +56,6 @@ break;
       default:
         assert(false && "Unsupport statement.");
         return;
-      case Stmt::CompoundAssignOperatorClass:
-        static_cast<ImplClass*>(this)->PostVisitBinaryOperator(C,
-                                         static_cast<const BinaryOperator*>(S));
-        break;
 
 #define POSTVISIT(NAME, FALLBACK) \
 case Stmt::NAME ## Class:\