Skip to content

[BoundsSafety] Unify handleCountedByAttrField and handlePtrCountedByEndedByAttr #12856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zmodem wants to merge 2 commits into
base: next
Choose a base branch
from
+37 −40
Open

[BoundsSafety] Unify handleCountedByAttrField and handlePtrCountedByEndedByAttr #12856

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a4cb2d
unify the handleCountedByAttrField and handlePtrCountedByEndedByAttr …
zmodem Apr 29, 2026
cf1d1c9
Merge remote-tracking branch 'swiftlang/next' into unify_handleCounte…
zmodem May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 37 additions & 40 deletions clang/lib/Sema/SemaDeclAttr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7788,34 +7788,6 @@ static void attachLateInstantiatedCountedByEndedByAttr(Sema &S, Decl *D,
#undef ADD_ATTR
}

static void handlePtrCountedByEndedByAttr(Sema &S, Decl *D,
const ParsedAttr &AL) {
unsigned Level;
if (!S.checkUInt32Argument(AL, AL.getArgAsExpr(1), Level))
return;

if (D->isTemplated()) {
DynamicBoundsAttrInfo Info(D, Level);
// Scope information will be invalid by the time we instantiate the
// template, so perform these checks now and delay the rest of the
// processing until the point of instantiation.
EarlyLifetimeAndScopeCheck EarlyCheck(S, Info.ScopeCheck,
Info.LifetimeCheck, AL.getKind(),
Info.Ty->isArrayType());
if (EarlyCheck.Visit(AL.getArgAsExpr(0)))
return;
attachLateInstantiatedCountedByEndedByAttr(S, D, AL, Level);
return;
}

AttributeCommonInfo::Kind Kind = AL.getKind();
const IdentifierInfo *AttrName =
AL.printMacroName() ? AL.getMacroIdentifier() : AL.getAttrName();
S.applyPtrCountedByEndedByAttr(D, Level, Kind, AL.getArgAsExpr(0),
AL.getLoc(), AL.getRange(),
("\'" + AttrName->getName() + "\'").str());
}

static void handleUnsafeLateConst(Sema &S, Decl *D,
const ParsedAttr &AL) {
D->addAttr(::new (S.Context) UnsafeLateConstAttr(S.Context, AL));
Expand Down Expand Up @@ -8535,13 +8507,14 @@ static void handleNoPFPAttrField(Sema &S, Decl *D, const ParsedAttr &AL) {
D->addAttr(NoFieldProtectionAttr::Create(S.Context, AL));
}

// TO_UPSTREAM(BoundsSafety) Rename to indicate not just fields and counted_by.
static void handleCountedByAttrField(Sema &S, Decl *D, const ParsedAttr &AL) {
/* TO_UPSTREAM(BoundsSafety) ON */
// In upstream 'counted_by' is subjected to FieldDecl only, whereas internally,
// the attribute applies to any other subjects. This code is to manually handle
// cases when the counted_by is applied to non-field decl without
// -fbounds-safety.
if (!isa<FieldDecl>(D)) {
if (!S.getLangOpts().BoundsSafetyAttributes && !isa<FieldDecl>(D)) {
// In upstream 'counted_by' is subjected to FieldDecl only, whereas internally,
// the attribute applies to any other subjects. This code is to manually handle
// cases when the counted_by is applied to non-field decl without
// -fbounds-safety.
S.Diag(AL.getLoc(), diag::err_attribute_wrong_decl_type_str)
<< AL.getAttrName()->getName() << AL.isRegularKeywordAttribute()
<< "non-static data members";
Expand All @@ -8550,6 +8523,36 @@ static void handleCountedByAttrField(Sema &S, Decl *D, const ParsedAttr &AL) {
}
/* TO_UPSTREAM(BoundsSafety) OFF */

/* TO_UPSTREAM(BoundsSafety) ON */
if (S.getLangOpts().BoundsSafetyAttributes) {
unsigned Level;
if (!S.checkUInt32Argument(AL, AL.getArgAsExpr(1), Level))
return;

if (D->isTemplated()) {
DynamicBoundsAttrInfo Info(D, Level);
// Scope information will be invalid by the time we instantiate the
// template, so perform these checks now and delay the rest of the
// processing until the point of instantiation.
EarlyLifetimeAndScopeCheck EarlyCheck(S, Info.ScopeCheck,
Info.LifetimeCheck, AL.getKind(),
Info.Ty->isArrayType());
if (EarlyCheck.Visit(AL.getArgAsExpr(0)))
return;
attachLateInstantiatedCountedByEndedByAttr(S, D, AL, Level);
return;
}

AttributeCommonInfo::Kind Kind = AL.getKind();
const IdentifierInfo *AttrName =
AL.printMacroName() ? AL.getMacroIdentifier() : AL.getAttrName();
S.applyPtrCountedByEndedByAttr(D, Level, Kind, AL.getArgAsExpr(0),
AL.getLoc(), AL.getRange(),
("\'" + AttrName->getName() + "\'").str());
return;
}
/* TO_UPSTREAM(BoundsSafety) OFF */

auto *CountExpr = AL.getArgAsExpr(0);
if (!CountExpr)
return;
Expand Down Expand Up @@ -9867,19 +9870,13 @@ ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D, const ParsedAttr &AL,
case ParsedAttr::AT_CountedByOrNull:
case ParsedAttr::AT_SizedBy:
case ParsedAttr::AT_SizedByOrNull:
/* TO_UPSTREAM(BoundsSafety) ON */
if (S.getLangOpts().BoundsSafetyAttributes) {
handlePtrCountedByEndedByAttr(S, D, AL);
break;
}
/* TO_UPSTREAM(BoundsSafety) OFF */
handleCountedByAttrField(S, D, AL);
break;

/* TO_UPSTREAM(BoundsSafety) ON*/
// BoundsSafety attributes:
case ParsedAttr::AT_PtrEndedBy:
handlePtrCountedByEndedByAttr(S, D, AL);
handleCountedByAttrField(S, D, AL);
break;
case ParsedAttr::AT_UnsafeLateConst:
handleUnsafeLateConst(S, D, AL);
Expand Down