Skip to content

[C] Allow __attribute__((nonstring)) on multidimensional arrays #138133

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.

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 16 additions & 2 deletions clang/lib/Sema/SemaInit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,22 @@ static void CheckStringInit(Expr *Str, QualType &DeclT, const ArrayType *AT,
<< Str->getSourceRange();
else if (StrLength - 1 == ArrayLen) {
// If the entity being initialized has the nonstring attribute, then
// silence the "missing nonstring" diagnostic.
if (const ValueDecl *D = Entity.getDecl();
// silence the "missing nonstring" diagnostic. If there's no entity,
// check whether we're initializing an array of arrays; if so, walk the
// parents to find an entity.
auto FindCorrectEntity =
[](const InitializedEntity *Entity) -> const ValueDecl * {
while (Entity) {
if (const ValueDecl *VD = Entity->getDecl())
return VD;
if (!Entity->getType()->isArrayType())
return nullptr;
Entity = Entity->getParent();
}

return nullptr;
};
if (const ValueDecl *D = FindCorrectEntity(&Entity);
!D || !D->hasAttr<NonStringAttr>())
S.Diag(
Str->getBeginLoc(),
Expand Down
Loading