https://github.com/AaronBallman updated
https://github.com/llvm/llvm-project/pull/138133
>From 3ee89ca85cccb395cee3d7d56c48c78594fa11db Mon Sep 17 00:00:00 2001
From: Aaron Ballman <aa...@aaronballman.com>
Date: Thu, 1 May 2025 09:48:10 -0400
Subject: [PATCH 1/3] [C] Allow __attribute__((nonstring)) on multidimensional
arrays
This addresses post-commit review feedback from the Linux kernel folks
and improves compatibility with the same feature in GCC
---
clang/lib/Sema/SemaInit.cpp | 17 ++++++-
clang/test/Sema/attr-nonstring.c | 80 +++++++++++++++++++++++++++++++-
2 files changed, 94 insertions(+), 3 deletions(-)
diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp
index 6900ccb11c3db..5bdf62e0c4e0d 100644
--- a/clang/lib/Sema/SemaInit.cpp
+++ b/clang/lib/Sema/SemaInit.cpp
@@ -261,8 +261,21 @@ 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 *Ret = nullptr;
+ for (const InitializedEntity *E = &Entity; E; E = Entity.getParent()) {
+ Ret = E->getDecl();
+ if (Ret)
+ break;
+ if (!E->getType()->isArrayType())
+ break;
+ }
+ return Ret;
+ };
+ if (const ValueDecl *D = FindCorrectEntity(Entity);
!D || !D->hasAttr<NonStringAttr>())
S.Diag(
Str->getBeginLoc(),
diff --git a/clang/test/Sema/attr-nonstring.c b/clang/test/Sema/attr-nonstring.c
index 31728e701a3fc..99520c8890500 100644
--- a/clang/test/Sema/attr-nonstring.c
+++ b/clang/test/Sema/attr-nonstring.c
@@ -2,7 +2,7 @@
// RUN: %clang_cc1 -fsyntax-only -verify=noncxx,expected,no-nonstring -Wextra
%s
// RUN: %clang_cc1 -fsyntax-only -verify=noncxx,expected,compat
-Wc++-unterminated-string-initialization %s
// RUN: %clang_cc1 -fsyntax-only -verify=noncxx,expected,compat -Wc++-compat %s
-// RUN: %clang_cc1 -fsyntax-only -verify=expected,cxx -x c++ %s
+// RUN: %clang_cc1 -fsyntax-only -verify=expected,cxx -x c++
-Wno-c99-designator %s
// RUN: %clang_cc1 -fsyntax-only -verify=expected,noncxx
-Wno-unterminated-string-initialization %s
// RUN: %clang_cc1 -fsyntax-only -verify=expected,noncxx -Wc++-compat -Wextra
-Wno-unterminated-string-initialization
-Wno-c++-unterminated-string-initialization %s
@@ -39,3 +39,81 @@ __attribute__((nonstring)) int eek2; //
expected-warning {{'nonstri
// diagnostic when you overwrite more than just the null terminator.
char too_big[3] = "this is too big"; // noncxx-warning {{initializer-string
for char array is too long}} \
cxx-error {{initializer-string for
char array is too long, array size is 3 but initializer has size 16 (including
the null terminating character)}}
+
+// Show that this also applies to arrays of objects containing strings, too.
+const char md_array[][3] __attribute__((nonstring)) = { "BAR", "FOO", }; //
compat-warning 2 {{initializer-string for character array is too long for C++,
array size is 3 but initializer has size 4 (including the null terminating
character)}} \
+
cxx-error 2 {{initializer-string for char array is too long, array size is 3
but initializer has size 4 (including the null terminating character)}}
+
+struct StructWithNSArray {
+ __attribute__((nonstring)) char blech[3];
+};
+
+struct StructWithNSArray s1[] = {
+ { "FOO" }, // compat-warning {{initializer-string for character array is too
long for C++, array size is 3 but initializer has size 4 (including the null
terminating character)}} \
+ cxx-error {{initializer-string for char array is too long,
array size is 3 but initializer has size 4 (including the null terminating
character)}}
+ { "BAR" } // compat-warning {{initializer-string for character array is too
long for C++, array size is 3 but initializer has size 4 (including the null
terminating character)}} \
+ cxx-error {{initializer-string for char array is too long,
array size is 3 but initializer has size 4 (including the null terminating
character)}}
+};
+
+struct T1 {
+ struct StructWithNSArray s[2];
+};
+struct U1 {
+ struct T1 t[2];
+};
+struct U1 u[] = {
+ {
+ .t[0] = {
+ .s[0] = { "FOO" }, // compat-warning {{initializer-string for character
array is too long for C++, array size is 3 but initializer has size 4
(including the null terminating character)}} \
+ cxx-error {{initializer-string for char array is
too long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
+ .s[1] = { "BAR" } // compat-warning {{initializer-string for character
array is too long for C++, array size is 3 but initializer has size 4
(including the null terminating character)}} \
+ cxx-error {{initializer-string for char array is
too long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
+ },
+ .t[1] = {
+ .s[0] = { "BIP" }, // compat-warning {{initializer-string for character
array is too long for C++, array size is 3 but initializer has size 4
(including the null terminating character)}} \
+ cxx-error {{initializer-string for char array is
too long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
+ .s[1] = { "BOP" } // compat-warning {{initializer-string for character
array is too long for C++, array size is 3 but initializer has size 4
(including the null terminating character)}} \
+ cxx-error {{initializer-string for char array is
too long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
+ }
+ }
+};
+
+struct StructWithoutNSArray {
+ char blech[3];
+};
+
+struct StructWithoutNSArray s2[] = {
+ { "FOO" }, // no-nonstring-warning {{initializer-string for character array
is too long, array size is 3 but initializer has size 4 (including the null
terminating character); did you mean to use the 'nonstring' attribute?}} \
+ compat-warning {{initializer-string for character array is too
long for C++, array size is 3 but initializer has size 4 (including the null
terminating character)}} \
+ cxx-error {{initializer-string for char array is
too long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
+ { "BAR" } // no-nonstring-warning {{initializer-string for character array
is too long, array size is 3 but initializer has size 4 (including the null
terminating character); did you mean to use the 'nonstring' attribute?}} \
+ compat-warning {{initializer-string for character array is too
long for C++, array size is 3 but initializer has size 4 (including the null
terminating character)}} \
+ cxx-error {{initializer-string for char array is too long,
array size is 3 but initializer has size 4 (including the null terminating
character)}}
+};
+
+struct T2 {
+ struct StructWithoutNSArray s[2];
+};
+struct U2 {
+ struct T2 t[2];
+};
+struct U2 u2[] = {
+ {
+ .t[0] = {
+ .s[0] = { "FOO" }, // no-nonstring-warning {{initializer-string for
character array is too long, array size is 3 but initializer has size 4
(including the null terminating character); did you mean to use the 'nonstring'
attribute?}} \
+ compat-warning {{initializer-string for character
array is too long for C++, array size is 3 but initializer has size 4
(including the null terminating character)}} \
+ cxx-error {{initializer-string for char array is
too long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
+ .s[1] = { "BAR" } // no-nonstring-warning {{initializer-string for
character array is too long, array size is 3 but initializer has size 4
(including the null terminating character); did you mean to use the 'nonstring'
attribute?}} \
+ compat-warning {{initializer-string for character
array is too long for C++, array size is 3 but initializer has size 4
(including the null terminating character)}} \
+ cxx-error {{initializer-string for char array is
too long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
+ },
+ .t[1] = {
+ .s[0] = { "BIP" }, // no-nonstring-warning {{initializer-string for
character array is too long, array size is 3 but initializer has size 4
(including the null terminating character); did you mean to use the 'nonstring'
attribute?}} \
+ compat-warning {{initializer-string for character
array is too long for C++, array size is 3 but initializer has size 4
(including the null terminating character)}} \
+ cxx-error {{initializer-string for char array is
too long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
+ .s[1] = { "BOP" } // no-nonstring-warning {{initializer-string for
character array is too long, array size is 3 but initializer has size 4
(including the null terminating character); did you mean to use the 'nonstring'
attribute?}} \
+ compat-warning {{initializer-string for character
array is too long for C++, array size is 3 but initializer has size 4
(including the null terminating character)}} \
+ cxx-error {{initializer-string for char array is
too long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
+ }
+ }
+};
>From 94ff2f61577cfd5091ec853466e0785381db6b50 Mon Sep 17 00:00:00 2001
From: Aaron Ballman <aa...@aaronballman.com>
Date: Thu, 1 May 2025 10:32:13 -0400
Subject: [PATCH 2/3] Go with a more direct implementation; NFC
---
clang/lib/Sema/SemaInit.cpp | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp
index 5bdf62e0c4e0d..2a0e6b1985187 100644
--- a/clang/lib/Sema/SemaInit.cpp
+++ b/clang/lib/Sema/SemaInit.cpp
@@ -264,18 +264,19 @@ static void CheckStringInit(Expr *Str, QualType &DeclT,
const ArrayType *AT,
// 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 *Ret = nullptr;
- for (const InitializedEntity *E = &Entity; E; E = Entity.getParent()) {
- Ret = E->getDecl();
- if (Ret)
- break;
- if (!E->getType()->isArrayType())
- break;
+ 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 Ret;
+
+ return nullptr;
};
- if (const ValueDecl *D = FindCorrectEntity(Entity);
+ if (const ValueDecl *D = FindCorrectEntity(&Entity);
!D || !D->hasAttr<NonStringAttr>())
S.Diag(
Str->getBeginLoc(),
>From f4a56c127babff35fe584952cc81c8311478283b Mon Sep 17 00:00:00 2001
From: Aaron Ballman <aa...@aaronballman.com>
Date: Thu, 1 May 2025 10:59:05 -0400
Subject: [PATCH 3/3] Update tests
---
clang/test/Sema/attr-nonstring.c | 230 +++++++++++++++++++++++--------
1 file changed, 171 insertions(+), 59 deletions(-)
diff --git a/clang/test/Sema/attr-nonstring.c b/clang/test/Sema/attr-nonstring.c
index 99520c8890500..3838aa3bbee15 100644
--- a/clang/test/Sema/attr-nonstring.c
+++ b/clang/test/Sema/attr-nonstring.c
@@ -44,76 +44,188 @@ char too_big[3] = "this is too big"; // noncxx-warning
{{initializer-string for
const char md_array[][3] __attribute__((nonstring)) = { "BAR", "FOO", }; //
compat-warning 2 {{initializer-string for character array is too long for C++,
array size is 3 but initializer has size 4 (including the null terminating
character)}} \
cxx-error 2 {{initializer-string for char array is too long, array size is 3
but initializer has size 4 (including the null terminating character)}}
-struct StructWithNSArray {
- __attribute__((nonstring)) char blech[3];
+struct StructWithArrays {
+ char string[3];
+ __attribute__((nonstring)) char nonstring[3];
};
-struct StructWithNSArray s1[] = {
- { "FOO" }, // compat-warning {{initializer-string for character array is too
long for C++, array size is 3 but initializer has size 4 (including the null
terminating character)}} \
- cxx-error {{initializer-string for char array is too long,
array size is 3 but initializer has size 4 (including the null terminating
character)}}
- { "BAR" } // compat-warning {{initializer-string for character array is too
long for C++, array size is 3 but initializer has size 4 (including the null
terminating character)}} \
- cxx-error {{initializer-string for char array is too long,
array size is 3 but initializer has size 4 (including the null terminating
character)}}
-};
-
-struct T1 {
- struct StructWithNSArray s[2];
-};
-struct U1 {
- struct T1 t[2];
-};
-struct U1 u[] = {
+struct StructWithArrays s1[] = {
{
- .t[0] = {
- .s[0] = { "FOO" }, // compat-warning {{initializer-string for character
array is too long for C++, array size is 3 but initializer has size 4
(including the null terminating character)}} \
- cxx-error {{initializer-string for char array is
too long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
- .s[1] = { "BAR" } // compat-warning {{initializer-string for character
array is too long for C++, array size is 3 but initializer has size 4
(including the null terminating character)}} \
- cxx-error {{initializer-string for char array is
too long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
- },
- .t[1] = {
- .s[0] = { "BIP" }, // compat-warning {{initializer-string for character
array is too long for C++, array size is 3 but initializer has size 4
(including the null terminating character)}} \
- cxx-error {{initializer-string for char array is
too long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
- .s[1] = { "BOP" } // compat-warning {{initializer-string for character
array is too long for C++, array size is 3 but initializer has size 4
(including the null terminating character)}} \
- cxx-error {{initializer-string for char array is
too long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
- }
+ "FOO", // no-nonstring-warning {{initializer-string for character array is
too long, array size is 3 but initializer has size 4 (including the null
terminating character); did you mean to use the 'nonstring' attribute?}} \
+ compat-warning {{initializer-string for character array is too
long for C++, array size is 3 but initializer has size 4 (including the null
terminating character)}} \
+ cxx-error {{initializer-string for char array is too long, array
size is 3 but initializer has size 4 (including the null terminating
character)}}
+ "BAR", // compat-warning {{initializer-string for character array is too
long for C++, array size is 3 but initializer has size 4 (including the null
terminating character)}} \
+ cxx-error {{initializer-string for char array is too long, array
size is 3 but initializer has size 4 (including the null terminating
character)}}
+ },
+ {
+ "BAZ", // no-nonstring-warning {{initializer-string for character array is
too long, array size is 3 but initializer has size 4 (including the null
terminating character); did you mean to use the 'nonstring' attribute?}} \
+ compat-warning {{initializer-string for character array is too
long for C++, array size is 3 but initializer has size 4 (including the null
terminating character)}} \
+ cxx-error {{initializer-string for char array is too long, array
size is 3 but initializer has size 4 (including the null terminating
character)}}
+ "BIP", // compat-warning {{initializer-string for character array is too
long for C++, array size is 3 but initializer has size 4 (including the null
terminating character)}} \
+ cxx-error {{initializer-string for char array is too long, array
size is 3 but initializer has size 4 (including the null terminating
character)}}
}
};
-struct StructWithoutNSArray {
- char blech[3];
+struct Inner {
+ struct StructWithArrays s[2];
};
-
-struct StructWithoutNSArray s2[] = {
- { "FOO" }, // no-nonstring-warning {{initializer-string for character array
is too long, array size is 3 but initializer has size 4 (including the null
terminating character); did you mean to use the 'nonstring' attribute?}} \
- compat-warning {{initializer-string for character array is too
long for C++, array size is 3 but initializer has size 4 (including the null
terminating character)}} \
- cxx-error {{initializer-string for char array is
too long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
- { "BAR" } // no-nonstring-warning {{initializer-string for character array
is too long, array size is 3 but initializer has size 4 (including the null
terminating character); did you mean to use the 'nonstring' attribute?}} \
- compat-warning {{initializer-string for character array is too
long for C++, array size is 3 but initializer has size 4 (including the null
terminating character)}} \
- cxx-error {{initializer-string for char array is too long,
array size is 3 but initializer has size 4 (including the null terminating
character)}}
+struct Outer {
+ struct Inner i[2];
};
-struct T2 {
- struct StructWithoutNSArray s[2];
-};
-struct U2 {
- struct T2 t[2];
+struct Outer o1[] = { // Array of Outer
+ { // Outer
+ { // Array of Inner
+ { // Inner
+ { // Array of StructWithArrays
+ { // StructWithArrays
+ "FOO", // no-nonstring-warning {{initializer-string for character
array is too long, array size is 3 but initializer has size 4 (including the
null terminating character); did you mean to use the 'nonstring' attribute?}} \
+ compat-warning {{initializer-string for character array
is too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too
long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
+ "BAR" // compat-warning {{initializer-string for character array
is too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too
long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
+ },
+ { // StructWithArrays
+ "BAZ", // no-nonstring-warning {{initializer-string for character
array is too long, array size is 3 but initializer has size 4 (including the
null terminating character); did you mean to use the 'nonstring' attribute?}} \
+ compat-warning {{initializer-string for character array
is too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too
long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
+ "BAT" // compat-warning {{initializer-string for character array
is too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too
long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
+ }
+ } // End array of StructWithArrays
+ }, // End Inner
+ { // Inner
+ { // Array of StructWithArrays
+ { // StructWithArrays
+ "BIP", // no-nonstring-warning {{initializer-string for character
array is too long, array size is 3 but initializer has size 4 (including the
null terminating character); did you mean to use the 'nonstring' attribute?}} \
+ compat-warning {{initializer-string for character array
is too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too
long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
+ "BOP" // compat-warning {{initializer-string for character array
is too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too
long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
+ },
+ { // StructWithArrays
+ "BAP", // no-nonstring-warning {{initializer-string for character
array is too long, array size is 3 but initializer has size 4 (including the
null terminating character); did you mean to use the 'nonstring' attribute?}} \
+ compat-warning {{initializer-string for character array
is too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too
long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
+ "BUP" // compat-warning {{initializer-string for character array
is too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too
long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
+ }
+ } // End array of StructWithArrays
+ } // End Inner
+ } // End array of Inner
+ }, // End Outer
+ { // Outer
+ { // Array of Inner
+ { // Inner
+ { // Array of StructWithArrays
+ { // StructWithArrays
+ "ABC", // no-nonstring-warning {{initializer-string for character
array is too long, array size is 3 but initializer has size 4 (including the
null terminating character); did you mean to use the 'nonstring' attribute?}} \
+ compat-warning {{initializer-string for character array
is too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too
long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
+ "CAB" // compat-warning {{initializer-string for character array
is too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too
long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
+ },
+ { // StructWithArrays
+ "BAC", // no-nonstring-warning {{initializer-string for character
array is too long, array size is 3 but initializer has size 4 (including the
null terminating character); did you mean to use the 'nonstring' attribute?}} \
+ compat-warning {{initializer-string for character array
is too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too
long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
+ "CBA" // compat-warning {{initializer-string for character array
is too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too
long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
+ }
+ } // End array of StructWithArrays
+ }, // End Inner
+ { // Inner
+ { // Array of StructWithArrays
+ { // StructWithArrays
+ "XYZ", // no-nonstring-warning {{initializer-string for character
array is too long, array size is 3 but initializer has size 4 (including the
null terminating character); did you mean to use the 'nonstring' attribute?}} \
+ compat-warning {{initializer-string for character array
is too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too
long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
+ "YZX" // compat-warning {{initializer-string for character array
is too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too
long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
+ },
+ { // StructWithArrays
+ "ZYX", // no-nonstring-warning {{initializer-string for character
array is too long, array size is 3 but initializer has size 4 (including the
null terminating character); did you mean to use the 'nonstring' attribute?}} \
+ compat-warning {{initializer-string for character array
is too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too
long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
+ "ZXY" // compat-warning {{initializer-string for character array
is too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too
long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
+ }
+ } // End array of StructWithArrays
+ } // End Inner
+ } // End array of Inner
+ }, // End Outer
};
-struct U2 u2[] = {
- {
- .t[0] = {
- .s[0] = { "FOO" }, // no-nonstring-warning {{initializer-string for
character array is too long, array size is 3 but initializer has size 4
(including the null terminating character); did you mean to use the 'nonstring'
attribute?}} \
- compat-warning {{initializer-string for character
array is too long for C++, array size is 3 but initializer has size 4
(including the null terminating character)}} \
- cxx-error {{initializer-string for char array is
too long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
- .s[1] = { "BAR" } // no-nonstring-warning {{initializer-string for
character array is too long, array size is 3 but initializer has size 4
(including the null terminating character); did you mean to use the 'nonstring'
attribute?}} \
- compat-warning {{initializer-string for character
array is too long for C++, array size is 3 but initializer has size 4
(including the null terminating character)}} \
- cxx-error {{initializer-string for char array is
too long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
+
+// Do the same test as above, but using designated initializers and a more
+// simple layout of the initialization.
+
+struct Outer o2[] = {
+ [0] = {
+ .i[0] = {
+ .s[0] = {
+ "FOO", // no-nonstring-warning {{initializer-string for character
array is too long, array size is 3 but initializer has size 4 (including the
null terminating character); did you mean to use the 'nonstring' attribute?}} \
+ compat-warning {{initializer-string for character array is
too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too long,
array size is 3 but initializer has size 4 (including the null terminating
character)}}
+ "BAR" // compat-warning {{initializer-string for character array is
too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too long,
array size is 3 but initializer has size 4 (including the null terminating
character)}}
+ },
+ .s[1] = {
+ "BAZ", // no-nonstring-warning {{initializer-string for character
array is too long, array size is 3 but initializer has size 4 (including the
null terminating character); did you mean to use the 'nonstring' attribute?}} \
+ compat-warning {{initializer-string for character array is
too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too long,
array size is 3 but initializer has size 4 (including the null terminating
character)}}
+ "BAT" // compat-warning {{initializer-string for character array is
too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too long,
array size is 3 but initializer has size 4 (including the null terminating
character)}}
+ }
+ },
+ .i[1] = {
+ .s[0] = {
+ "BIP", // no-nonstring-warning {{initializer-string for character
array is too long, array size is 3 but initializer has size 4 (including the
null terminating character); did you mean to use the 'nonstring' attribute?}} \
+ compat-warning {{initializer-string for character array is
too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too long,
array size is 3 but initializer has size 4 (including the null terminating
character)}}
+ "BOP" // compat-warning {{initializer-string for character array is
too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too long,
array size is 3 but initializer has size 4 (including the null terminating
character)}}
+ },
+ .s[1] = {
+ "BAP", // no-nonstring-warning {{initializer-string for character
array is too long, array size is 3 but initializer has size 4 (including the
null terminating character); did you mean to use the 'nonstring' attribute?}} \
+ compat-warning {{initializer-string for character array is
too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too long,
array size is 3 but initializer has size 4 (including the null terminating
character)}}
+ "BUP" // compat-warning {{initializer-string for character array is
too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too long,
array size is 3 but initializer has size 4 (including the null terminating
character)}}
+ }
+ }
+ },
+ [1] = {
+ .i[0] = {
+ .s[0] = {
+ "ABC", // no-nonstring-warning {{initializer-string for character
array is too long, array size is 3 but initializer has size 4 (including the
null terminating character); did you mean to use the 'nonstring' attribute?}} \
+ compat-warning {{initializer-string for character array is
too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too long,
array size is 3 but initializer has size 4 (including the null terminating
character)}}
+ "CAB" // compat-warning {{initializer-string for character array is
too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too long,
array size is 3 but initializer has size 4 (including the null terminating
character)}}
+ },
+ .s[1] = {
+ "BAC", // no-nonstring-warning {{initializer-string for character
array is too long, array size is 3 but initializer has size 4 (including the
null terminating character); did you mean to use the 'nonstring' attribute?}} \
+ compat-warning {{initializer-string for character array is
too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too long,
array size is 3 but initializer has size 4 (including the null terminating
character)}}
+ "CBA" // compat-warning {{initializer-string for character array is
too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too long,
array size is 3 but initializer has size 4 (including the null terminating
character)}}
+ }
},
- .t[1] = {
- .s[0] = { "BIP" }, // no-nonstring-warning {{initializer-string for
character array is too long, array size is 3 but initializer has size 4
(including the null terminating character); did you mean to use the 'nonstring'
attribute?}} \
- compat-warning {{initializer-string for character
array is too long for C++, array size is 3 but initializer has size 4
(including the null terminating character)}} \
- cxx-error {{initializer-string for char array is
too long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
- .s[1] = { "BOP" } // no-nonstring-warning {{initializer-string for
character array is too long, array size is 3 but initializer has size 4
(including the null terminating character); did you mean to use the 'nonstring'
attribute?}} \
- compat-warning {{initializer-string for character
array is too long for C++, array size is 3 but initializer has size 4
(including the null terminating character)}} \
- cxx-error {{initializer-string for char array is
too long, array size is 3 but initializer has size 4 (including the null
terminating character)}}
+ .i[1] = {
+ .s[0] = {
+ "XYZ", // no-nonstring-warning {{initializer-string for character
array is too long, array size is 3 but initializer has size 4 (including the
null terminating character); did you mean to use the 'nonstring' attribute?}} \
+ compat-warning {{initializer-string for character array is
too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too long,
array size is 3 but initializer has size 4 (including the null terminating
character)}}
+ "YZX" // compat-warning {{initializer-string for character array is
too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too long,
array size is 3 but initializer has size 4 (including the null terminating
character)}}
+ },
+ .s[1] = {
+ "ZYX", // no-nonstring-warning {{initializer-string for character
array is too long, array size is 3 but initializer has size 4 (including the
null terminating character); did you mean to use the 'nonstring' attribute?}} \
+ compat-warning {{initializer-string for character array is
too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too long,
array size is 3 but initializer has size 4 (including the null terminating
character)}}
+ "ZXY" // compat-warning {{initializer-string for character array is
too long for C++, array size is 3 but initializer has size 4 (including the
null terminating character)}} \
+ cxx-error {{initializer-string for char array is too long,
array size is 3 but initializer has size 4 (including the null terminating
character)}}
+ }
}
}
};
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
