Move the error check into BuildCXXDefaultInit

Signed-off-by: yronglin <[email protected]>

Author: yronglin

clang/lib/Sema/SemaExpr.cpp

@@ -5563,6 +5563,12 @@ ExprResult Sema::BuildCXXDefaultArgExpr(SourceLocation CallLoc,
 ExprResult Sema::BuildCXXDefaultInitExpr(SourceLocation Loc, FieldDecl *Field) {
   assert(Field->hasInClassInitializer());
 
+  // We do not want to aggressively cutoff parsing. Try to recover when
+  // in-class-initializer had errors.
+  if (Field->getInClassInitializer() &&
+      Field->getInClassInitializer()->containsErrors())
+    return Field->getInClassInitializer();
+
   // If we might have already tried and failed to instantiate, don't try again.
   if (Field->isInvalidDecl())
     return ExprError();

clang/lib/Sema/SemaInit.cpp

@@ -751,18 +751,6 @@ void InitListChecker::FillInEmptyInitForField(unsigned Init, FieldDecl *Field,
       if (VerifyOnly)
         return;
 
-      // We do not want to aggressively set the hadError flag and cutoff
-      // parsing. Try to recover when in-class-initializer had errors.
-      if (Field->getInClassInitializer() &&
-          Field->getInClassInitializer()->containsErrors()) {
-        if (Init < NumInits)
-          ILE->setInit(Init, Field->getInClassInitializer());
-        else
-          ILE->updateInit(SemaRef.Context, Init,
-                          Field->getInClassInitializer());
-        return;
-      }
-
       ExprResult DIE;
       {
         // Enter a default initializer rebuild context, then we can support