Rebase and address comments

Signed-off-by: yronglin <yronglin777@gmail.com>

Author: yronglin

clang/lib/StaticAnalyzer/Core/ExprEngine.cpp

@@ -1964,11 +1964,11 @@ void ExprEngine::Visit(const Stmt *S, ExplodedNode *Pred,
     case Stmt::CXXDefaultArgExprClass:
     case Stmt::CXXDefaultInitExprClass: {
       Bldr.takeNodes(Pred);
-      ExplodedNodeSet CheckedSet;
-      getCheckerManager().runCheckersForPreStmt(CheckedSet, Pred, S, *this);
+      ExplodedNodeSet PreVisit;
+      getCheckerManager().runCheckersForPreStmt(PreVisit, Pred, S, *this);
 
       ExplodedNodeSet Tmp;
-      StmtNodeBuilder Bldr2(CheckedSet, Tmp, *currBldrCtx);
+      StmtNodeBuilder Bldr2(PreVisit, Tmp, *currBldrCtx);
 
       bool HasRewrittenInit = false;
       const Expr *ArgE = nullptr;
@@ -1982,12 +1982,11 @@ void ExprEngine::Visit(const Stmt *S, ExplodedNode *Pred,
         llvm_unreachable("unknown constant wrapper kind");
 
       if (HasRewrittenInit) {
-        for (auto *I : CheckedSet) {
-          ProgramStateRef state = (*I).getState();
-          const LocationContext *LCtx = (*I).getLocationContext();
-          SVal Val = state->getSVal(ArgE, LCtx);
-          state = state->BindExpr(S, LCtx, Val);
-          Bldr2.generateNode(S, I, state);
+        for (auto *N : PreVisit) {
+          ProgramStateRef state = N->getState();
+          const LocationContext *LCtx = N->getLocationContext();
+          state = state->BindExpr(S, LCtx, state->getSVal(ArgE, LCtx));
+          Bldr2.generateNode(S, N, state);
         }
       } else {
         // If it's not rewritten, the contents of these expressions are not
@@ -2000,13 +1999,10 @@ void ExprEngine::Visit(const Stmt *S, ExplodedNode *Pred,
         }
 
         std::optional<SVal> ConstantVal = svalBuilder.getConstantVal(ArgE);
-        if (!ConstantVal)
-          ConstantVal = UnknownVal();
-
         const LocationContext *LCtx = Pred->getLocationContext();
-        for (auto *I : CheckedSet) {
+        for (auto *I : PreVisit) {
           ProgramStateRef State = I->getState();
-          State = State->BindExpr(S, LCtx, *ConstantVal);
+          State = State->BindExpr(S, LCtx, ConstantVal.value_or(UnknownVal()));
           if (IsTemporary)
             State = createTemporaryRegionIfNeeded(State, LCtx, cast<Expr>(S),
                                                   cast<Expr>(S));

clang/test/Analysis/cxx-uninitialized-object.cpp

@@ -1,4 +1,4 @@
-// RUN: %clang_analyze_cc1 -std=c++14 -verify=expected,pedantic  %s \
+// RUN: %clang_analyze_cc1 -std=c++14 -verify  %s \
 // RUN:   -analyzer-checker=core \
 // RUN:   -analyzer-checker=optin.cplusplus.UninitializedObject \
 // RUN:   -analyzer-config optin.cplusplus.UninitializedObject:Pedantic=true -DPEDANTIC \
@@ -1123,7 +1123,7 @@ struct CXX11MemberInitTest2 {
     RecordType(int) {}
   };
 
-  RecordType rec = RecordType(int()); // expected-warning {{2 uninitialized fields at the end of the constructor call}}
+  RecordType rec = RecordType(int()); // expected-warning {{2 uninitialized fields}}
   int dontGetFilteredByNonPedanticMode = 0;
 
   CXX11MemberInitTest2() {}