@@ -3095,7 +3095,7 @@ InitListChecker::CheckDesignatedInitializer(const InitializedEntity &Entity,
30953095 }
30963096
30973097 const auto GenerateDesignatedInitReorderingFixit =
3098- [&](SemaBase::SemaDiagnosticBuilder &Diags ) {
3098+ [&](SemaBase::SemaDiagnosticBuilder &Diag ) {
30993099 struct ReorderInfo {
31003100 int Pos{};
31013101 const Expr *InitExpr{};
@@ -3107,11 +3107,10 @@ InitListChecker::CheckDesignatedInitializer(const InitializedEntity &Entity,
31073107 const auto *CxxRecord =
31083108 IList->getSemanticForm ()->getType ()->getAsCXXRecordDecl ();
31093109
3110- for (const auto & Field : CxxRecord->fields ()) {
3110+ for (const FieldDecl * Field : CxxRecord->fields ())
31113111 MemberNameInx[Field->getIdentifier ()] = Field->getFieldIndex ();
3112- }
31133112
3114- for (const auto *Init : IList->inits ()) {
3113+ for (const Expr *Init : IList->inits ()) {
31153114 if (const auto *DI =
31163115 dyn_cast_if_present<DesignatedInitExpr>(Init)) {
31173116 // We expect only one Designator
@@ -3148,8 +3147,8 @@ InitListChecker::CheckDesignatedInitializer(const InitializedEntity &Entity,
31483147 const auto InitText =
31493148 Lexer::getSourceText (CharRange, SM, LangOpts);
31503149
3151- Diags << FixItHint::CreateReplacement (OrigExpr->getSourceRange (),
3152- InitText.str ());
3150+ Diag << FixItHint::CreateReplacement (OrigExpr->getSourceRange (),
3151+ InitText.str ());
31533152 }
31543153 };
31553154
@@ -3162,10 +3161,10 @@ InitListChecker::CheckDesignatedInitializer(const InitializedEntity &Entity,
31623161 unsigned OldIndex = StructuredIndex - 1 ;
31633162 if (StructuredList && OldIndex <= StructuredList->getNumInits ()) {
31643163 if (Expr *PrevInit = StructuredList->getInit (OldIndex)) {
3165- auto Diags = SemaRef.Diag (PrevInit->getBeginLoc (),
3166- diag::note_previous_field_init)
3167- << PrevField << PrevInit->getSourceRange ();
3168- GenerateDesignatedInitReorderingFixit (Diags );
3164+ auto Diag = SemaRef.Diag (PrevInit->getBeginLoc (),
3165+ diag::note_previous_field_init)
3166+ << PrevField << PrevInit->getSourceRange ();
3167+ GenerateDesignatedInitReorderingFixit (Diag );
31693168 }
31703169 }
31713170 }
0 commit comments