fixup! [clang][dataflow] Propagate locations from result objects to initializers.

Author: martinboehme

clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp

@@ -27,6 +27,8 @@
 #include <cassert>
 #include <utility>
 
+#define DEBUG_TYPE "dataflow"
+
 namespace clang {
 namespace dataflow {
 
@@ -553,8 +555,10 @@ class ResultObjectVisitor : public RecursiveASTVisitor<ResultObjectVisitor> {
     // All other expression nodes that propagate a record prvalue should have
     // exactly one child.
     llvm::SmallVector<Stmt *> Children(E->child_begin(), E->child_end());
-    if (Children.size() != 1)
-      E->dump();
+    LLVM_DEBUG({
+      if (Children.size() != 1)
+        E->dump();
+    });
     assert(Children.size() == 1);
     for (Stmt *S : Children)
       PropagateResultObject(cast<Expr>(S), Loc);

clang/lib/Analysis/FlowSensitive/Transfer.cpp

@@ -470,8 +470,14 @@ class TransferVisitor : public ConstStmtVisitor<TransferVisitor> {
   void VisitCXXDefaultInitExpr(const CXXDefaultInitExpr *S) {
     const Expr *InitExpr = S->getExpr();
     assert(InitExpr != nullptr);
-    if (!(S->getType()->isRecordType() && S->isPRValue()))
-      propagateValueOrStorageLocation(*InitExpr, *S, Env);
+
+    // If this is a prvalue of record type, the handler for `*InitExpr` (if one
+    // exists) will initialize the result object; there is no value to propgate
+    // here.
+    if (S->getType()->isRecordType() && S->isPRValue())
+      return;
+
+    propagateValueOrStorageLocation(*InitExpr, *S, Env);
   }
 
   void VisitCXXConstructExpr(const CXXConstructExpr *S) {