From: Andrew Pinski <apin...@marvell.com>
So char arrays are not the only type that be initialized from {"a"}.
We can have wchar_t (L"") and char16_t (u"") types too. So let's
print out the type of the array instead of just saying char.
Note in the testsuite I used regex . to match '[' and ']' as
I could not figure out how many '\' I needed.
OK? Bootstrapped and tested on x86_64-linux-gnu with no regressions.
gcc/c/ChangeLog:
* c-typeck.cc (process_init_element): Print out array type
for excessive elements.
gcc/testsuite/ChangeLog:
* gcc.dg/init-bad-1.c: Update error message.
* gcc.dg/init-bad-2.c: Likewise.
* gcc.dg/init-bad-3.c: Likewise.
* gcc.dg/init-excess-3.c: Likewise.
* gcc.dg/pr61096-1.c: Likewise.
---
gcc/c/c-typeck.cc | 2 +-
gcc/testsuite/gcc.dg/init-bad-1.c | 2 +-
gcc/testsuite/gcc.dg/init-bad-2.c | 2 +-
gcc/testsuite/gcc.dg/init-bad-3.c | 2 +-
gcc/testsuite/gcc.dg/init-excess-3.c | 12 ++++++------
gcc/testsuite/gcc.dg/pr61096-1.c | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/gcc/c/c-typeck.cc b/gcc/c/c-typeck.cc
index 0fc382c..f1a1752 100644
--- a/gcc/c/c-typeck.cc
+++ b/gcc/c/c-typeck.cc
@@ -10631,7 +10631,7 @@ process_init_element (location_t loc, struct c_expr
value, bool implicit,
{
if (constructor_stack->replacement_value.value)
{
- error_init (loc, "excess elements in %<char%> array initializer");
+ error_init (loc, "excess elements in %qT initializer",
constructor_type);
return;
}
else if (string_flag)
diff --git a/gcc/testsuite/gcc.dg/init-bad-1.c
b/gcc/testsuite/gcc.dg/init-bad-1.c
index 0da10c3..7c80006 100644
--- a/gcc/testsuite/gcc.dg/init-bad-1.c
+++ b/gcc/testsuite/gcc.dg/init-bad-1.c
@@ -18,7 +18,7 @@ char s[1] = "x";
char s1[1] = { "x" };
char t[1] = "xy"; /* { dg-warning "initializer-string for array of 'char' is
too long" } */
char t1[1] = { "xy" }; /* { dg-warning "initializer-string for array of 'char'
is too long" } */
-char u[1] = { "x", "x" }; /* { dg-error "excess elements in 'char' array
initializer" } */
+char u[1] = { "x", "x" }; /* { dg-error "excess elements in 'char.1.'
initializer" } */
/* { dg-message "near init" "near" { target *-*-* } .-1 } */
int i = { };
diff --git a/gcc/testsuite/gcc.dg/init-bad-2.c
b/gcc/testsuite/gcc.dg/init-bad-2.c
index 4775c48..57fd9f9 100644
--- a/gcc/testsuite/gcc.dg/init-bad-2.c
+++ b/gcc/testsuite/gcc.dg/init-bad-2.c
@@ -19,7 +19,7 @@ char s[1] = "x";
char s1[1] = { "x" };
char t[1] = "xy"; /* { dg-warning "initializer-string for array of 'char' is
too long" } */
char t1[1] = { "xy" }; /* { dg-warning "initializer-string for array of 'char'
is too long" } */
-char u[1] = { "x", "x" }; /* { dg-error "excess elements in 'char' array
initializer" } */
+char u[1] = { "x", "x" }; /* { dg-error "excess elements in 'char.1.'
initializer" } */
/* { dg-message "near init" "near" { target *-*-* } .-1 } */
int j = { 1 };
diff --git a/gcc/testsuite/gcc.dg/init-bad-3.c
b/gcc/testsuite/gcc.dg/init-bad-3.c
index c5c338d..c22e8ec 100644
--- a/gcc/testsuite/gcc.dg/init-bad-3.c
+++ b/gcc/testsuite/gcc.dg/init-bad-3.c
@@ -19,7 +19,7 @@ char s[1] = "x";
char s1[1] = { "x" };
char t[1] = "xy"; /* { dg-error "initializer-string for array of 'char' is too
long" } */
char t1[1] = { "xy" }; /* { dg-error "initializer-string for array of 'char'
is too long" } */
-char u[1] = { "x", "x" }; /* { dg-error "excess elements in 'char' array
initializer" } */
+char u[1] = { "x", "x" }; /* { dg-error "excess elements in 'char.1.'
initializer" } */
/* { dg-message "near init" "near" { target *-*-* } .-1 } */
int j = { 1 };
diff --git a/gcc/testsuite/gcc.dg/init-excess-3.c
b/gcc/testsuite/gcc.dg/init-excess-3.c
index 7741261..c03a984 100644
--- a/gcc/testsuite/gcc.dg/init-excess-3.c
+++ b/gcc/testsuite/gcc.dg/init-excess-3.c
@@ -4,12 +4,12 @@
/* { dg-options "" } */
-char s0[] = {"abc",1}; /* { dg-error "array initializer|near init" } */
-char s1[] = {"abc","a"}; /* { dg-error "array initializer|near init" } */
-char s2[] = {1,"abc"}; /* { dg-error "array initializer|near init|computable
at load time" } */
+char s0[] = {"abc",1}; /* { dg-error "'char..' initializer|near init" } */
+char s1[] = {"abc","a"}; /* { dg-error "'char..' initializer|near init" } */
+char s2[] = {1,"abc"}; /* { dg-error "'char..' initializer|near
init|computable at load time" } */
/* { dg-warning "integer from pointer without a cast" "" { target *-*-* } .-1
} */
-char s3[5] = {"abc",1}; /* { dg-error "array initializer|near init" } */
-char s4[5] = {"abc","a"}; /* { dg-error "array initializer|near init" } */
-char s5[5] = {1,"abc"}; /* { dg-error "array initializer|near init|computable
at load time" } */
+char s3[5] = {"abc",1}; /* { dg-error "'char.5.' initializer|near init" } */
+char s4[5] = {"abc","a"}; /* { dg-error "'char.5.' initializer|near init" } */
+char s5[5] = {1,"abc"}; /* { dg-error "'char.5.' initializer|near
init|computable at load time" } */
/* { dg-warning "integer from pointer without a cast" "" { target *-*-* } .-1
} */
diff --git a/gcc/testsuite/gcc.dg/pr61096-1.c b/gcc/testsuite/gcc.dg/pr61096-1.c
index f41789c..90ffb80 100644
--- a/gcc/testsuite/gcc.dg/pr61096-1.c
+++ b/gcc/testsuite/gcc.dg/pr61096-1.c
@@ -47,7 +47,7 @@ __extension__ int a15[10] = {[2 ... 1] = 4 }; /* { dg-error
"31:empty index rang
__extension__ int a16[10] = {[2 ... 100] = 4 }; /* { dg-error "31:array index
range in initializer exceeds array bounds" } */
int a17[] = { .B = 1 }; /* { dg-error "15:field name not in record or union
initializer" } */
int a18[] = { e }; /* { dg-error "15:initializer element is not constant" } */
-char a19[1] = { "x", "x" }; /* { dg-error "22:excess elements in 'char' array
initializer" } */
+char a19[1] = { "x", "x" }; /* { dg-error "22:excess elements in 'char.1.'
initializer" } */
void
bar (void)
--
1.8.3.1
