Skip to content

Commit 74ecedd

Browse files
committed
[BoundsSafety] Avoid designated initializers, which is a C++20 standard
1 parent 4efde7b commit 74ecedd

File tree

1 file changed

+27
-26
lines changed

1 file changed

+27
-26
lines changed

clang/lib/Sema/BoundsSafetySuggestions.cpp

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -446,23 +446,23 @@ bool UnsafeOperationVisitor::FindSingleEntity(
446446
if (const auto *Param = dyn_cast<ParmVarDecl>(SingleVarDecl)) {
447447
// Variable definition is from a __single parameter
448448
BoundsSafetySuggestionHandler::SingleEntity Entity = {
449-
.Kind =
450-
BoundsSafetySuggestionHandler::AssignmentSourceKind::Parameter,
451-
.Entity = Param,
452-
.AssignmentExpr = AssignmentExpr,
453-
.SinglePointeeTy = SinglePointeeTy};
449+
/*Kind*/ BoundsSafetySuggestionHandler::AssignmentSourceKind::
450+
Parameter,
451+
/*Entity*/ Param,
452+
/*AssignmentExpr*/ AssignmentExpr,
453+
/*SinglePointeeTy*/ SinglePointeeTy};
454454
SingleEntities.emplace_back(Entity);
455455
return true;
456456
}
457457

458458
if (SingleVarDecl->hasGlobalStorage() && !SingleVarDecl->isStaticLocal()) {
459459
// Variable definition is from a __single global
460460
BoundsSafetySuggestionHandler::SingleEntity Entity = {
461-
.Kind =
462-
BoundsSafetySuggestionHandler::AssignmentSourceKind::GlobalVar,
463-
.Entity = SingleVarDecl,
464-
.AssignmentExpr = AssignmentExpr,
465-
.SinglePointeeTy = SinglePointeeTy};
461+
/*Kind*/ BoundsSafetySuggestionHandler::AssignmentSourceKind::
462+
GlobalVar,
463+
/*Entity*/ SingleVarDecl,
464+
/*AssignmentExpr*/ AssignmentExpr,
465+
/*SinglePointeeTy*/ SinglePointeeTy};
466466
SingleEntities.emplace_back(Entity);
467467
return true;
468468
}
@@ -471,10 +471,11 @@ bool UnsafeOperationVisitor::FindSingleEntity(
471471
// Variable definition is from a local __single or a
472472
// "locally scoped" static __single.
473473
BoundsSafetySuggestionHandler::SingleEntity Entity = {
474-
.Kind = BoundsSafetySuggestionHandler::AssignmentSourceKind::LocalVar,
475-
.Entity = SingleVarDecl,
476-
.AssignmentExpr = AssignmentExpr,
477-
.SinglePointeeTy = SinglePointeeTy};
474+
/*Kind*/ BoundsSafetySuggestionHandler::AssignmentSourceKind::
475+
LocalVar,
476+
/*Entity*/ SingleVarDecl,
477+
/*AssignmentExpr*/ AssignmentExpr,
478+
/*SinglePointeeTy*/ SinglePointeeTy};
478479
SingleEntities.emplace_back(Entity);
479480
return true;
480481
}
@@ -509,11 +510,11 @@ bool UnsafeOperationVisitor::FindSingleEntity(
509510
assert(IsReallySinglePtr(DirectCallDecl->getReturnType()));
510511

511512
BoundsSafetySuggestionHandler::SingleEntity Entity = {
512-
.Kind = BoundsSafetySuggestionHandler::AssignmentSourceKind::
513+
/*Kind*/ BoundsSafetySuggestionHandler::AssignmentSourceKind::
513514
FunctionCallReturnValue,
514-
.Entity = DirectCallDecl,
515-
.AssignmentExpr = AssignmentExpr,
516-
.SinglePointeeTy = SinglePointeeTy};
515+
/*Entity*/ DirectCallDecl,
516+
/*AssignmentExpr*/ AssignmentExpr,
517+
/*SinglePointeeTy*/ SinglePointeeTy};
517518
SingleEntities.emplace_back(Entity);
518519
return true;
519520
}
@@ -532,10 +533,10 @@ bool UnsafeOperationVisitor::FindSingleEntity(
532533
}
533534

534535
BoundsSafetySuggestionHandler::SingleEntity Entity = {
535-
.Kind = AssignmentKind,
536-
.Entity = FD,
537-
.AssignmentExpr = AssignmentExpr,
538-
.SinglePointeeTy = SinglePointeeTy};
536+
/*Kind*/ AssignmentKind,
537+
/*Entity*/ FD,
538+
/*AssignmentExpr*/ AssignmentExpr,
539+
/*SinglePointeeTy*/ SinglePointeeTy};
539540
SingleEntities.emplace_back(Entity);
540541
return true;
541542
}
@@ -554,11 +555,11 @@ bool UnsafeOperationVisitor::FindSingleEntity(
554555
if (const auto *DRE = dyn_cast<DeclRefExpr>(BaseExpr)) {
555556
if (const auto *ArrayDecl = dyn_cast<VarDecl>(DRE->getDecl())) {
556557
BoundsSafetySuggestionHandler::SingleEntity Entity = {
557-
.Kind = BoundsSafetySuggestionHandler::AssignmentSourceKind::
558+
/*Kind*/ BoundsSafetySuggestionHandler::AssignmentSourceKind::
558559
ArrayElement,
559-
.Entity = ArrayDecl,
560-
.AssignmentExpr = AssignmentExpr,
561-
.SinglePointeeTy = SinglePointeeTy};
560+
/*Entity*/ ArrayDecl,
561+
/*AssignmentExpr*/ AssignmentExpr,
562+
/*SinglePointeeTy*/ SinglePointeeTy};
562563
SingleEntities.emplace_back(Entity);
563564
return true;
564565
}

0 commit comments

Comments
 (0)