1 files changed, 8 insertions, 1 deletions
diff --git a/lib/Checker/GRExprEngine.cpp b/lib/Checker/GRExprEngine.cpp
index 9c1eef23b5..0c3a7bbc15 100644
--- a/lib/Checker/GRExprEngine.cpp
+++ b/lib/Checker/GRExprEngine.cpp
@@ -2682,7 +2682,14 @@ void GRExprEngine::VisitDeclStmt(const DeclStmt *DS, ExplodedNode *Pred,
     if (getContext().getLangOptions().CPlusPlus && InitTy->isRecordType()) {
       // Delegate expressions of C++ record type evaluation to AggExprVisitor.
       VisitAggExpr(InitEx, GetState(Pred)->getLValue(VD,
-                                       Pred->getLocationContext()), Pred, Dst);
+                                       Pred->getLocationContext()), Pred, Tmp);
+
+      // FIXME: remove later when all paths through VisitAggExpr work properly
+      if (Tmp.empty())
+        Tmp.Add(Pred);
+      // Call checkers for initialized aggregates
+      CheckerVisit(DS, Dst, Tmp, PreVisitStmtCallback);
+
       return;
     } else if (VD->getType()->isReferenceType())
       VisitLValue(InitEx, Pred, Tmp);