[cfe-commits] r63435 - in /cfe/trunk: include/clang/Basic/DiagnosticSemaKinds.def lib/Sema/SemaInit.cpp test/CodeGen/globalinit.c test/CodeGen/init.c test/CodeGen/trunc-array-initializer.c test/CodeGen/vector.c test/Sema/array-init.c test/Sema/vector-init.c test/SemaCXX/dcl_init_aggr.cpp
Douglas Gregor
dgregor at apple.com
Fri Jan 30 14:26:29 PST 2009
Author: dgregor
Date: Fri Jan 30 16:26:29 2009
New Revision: 63435
URL: http://llvm.org/viewvc/llvm-project?rev=63435&view=rev
Log:
Upgrade the "excess elements in array initializer" warning to an
error, since both C99 and C++ consider it an error. For reference, GCC
makes this a warning while G++ makes it an error.
Removed:
cfe/trunk/test/CodeGen/trunc-array-initializer.c
Modified:
cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.def
cfe/trunk/lib/Sema/SemaInit.cpp
cfe/trunk/test/CodeGen/globalinit.c
cfe/trunk/test/CodeGen/init.c
cfe/trunk/test/CodeGen/vector.c
cfe/trunk/test/Sema/array-init.c
cfe/trunk/test/Sema/vector-init.c
cfe/trunk/test/SemaCXX/dcl_init_aggr.cpp
Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.def
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.def?rev=63435&r1=63434&r2=63435&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.def (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.def Fri Jan 30 16:26:29 2009
@@ -540,7 +540,7 @@
"variable-sized object may not be initialized")
DIAG(err_array_init_list_required, ERROR,
"initialization with '{...}' expected for array")
-DIAG(warn_excess_initializers, WARNING,
+DIAG(err_excess_initializers, ERROR,
"excess elements in array initializer")
DIAG(err_excess_initializers_in_char_array_initializer, ERROR,
"excess elements in char array initializer")
Modified: cfe/trunk/lib/Sema/SemaInit.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaInit.cpp?rev=63435&r1=63434&r2=63435&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaInit.cpp (original)
+++ cfe/trunk/lib/Sema/SemaInit.cpp Fri Jan 30 16:26:29 2009
@@ -283,9 +283,10 @@
<< IList->getInit(Index)->getSourceRange();
hadError = true;
} else if (!T->isIncompleteType()) {
- // Don't warn for incomplete types, since we'll get an error elsewhere
+ // Don't complain for incomplete types, since we'll get an error
+ // elsewhere
SemaRef->Diag(IList->getInit(Index)->getLocStart(),
- diag::warn_excess_initializers)
+ diag::err_excess_initializers)
<< IList->getInit(Index)->getSourceRange();
}
}
Modified: cfe/trunk/test/CodeGen/globalinit.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/globalinit.c?rev=63435&r1=63434&r2=63435&view=diff
==============================================================================
--- cfe/trunk/test/CodeGen/globalinit.c (original)
+++ cfe/trunk/test/CodeGen/globalinit.c Fri Jan 30 16:26:29 2009
@@ -34,7 +34,6 @@
// Scalars in braces.
static int a = { 1 };
-static int b = { 1, 2 };
// References to enums.
enum {
Modified: cfe/trunk/test/CodeGen/init.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/init.c?rev=63435&r1=63434&r2=63435&view=diff
==============================================================================
--- cfe/trunk/test/CodeGen/init.c (original)
+++ cfe/trunk/test/CodeGen/init.c Fri Jan 30 16:26:29 2009
@@ -2,7 +2,6 @@
void f1() {
// Scalars in braces.
int a = { 1 };
- int b = { 1, 2 };
}
void f2() {
Removed: cfe/trunk/test/CodeGen/trunc-array-initializer.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/trunc-array-initializer.c?rev=63434&view=auto
==============================================================================
--- cfe/trunk/test/CodeGen/trunc-array-initializer.c (original)
+++ cfe/trunk/test/CodeGen/trunc-array-initializer.c (removed)
@@ -1,3 +0,0 @@
-// RUN: clang -emit-llvm %s -o %t
-
-int ary[2] = { 1, 2, 3 };
Modified: cfe/trunk/test/CodeGen/vector.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/vector.c?rev=63435&r1=63434&r2=63435&view=diff
==============================================================================
--- cfe/trunk/test/CodeGen/vector.c (original)
+++ cfe/trunk/test/CodeGen/vector.c Fri Jan 30 16:26:29 2009
@@ -8,4 +8,3 @@
__v4hi x = {1,2,3};
__v4hi y = {1,2,3,4};
-__v4hi z = {1,2,3,4,5};
Modified: cfe/trunk/test/Sema/array-init.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/array-init.c?rev=63435&r1=63434&r2=63435&view=diff
==============================================================================
--- cfe/trunk/test/Sema/array-init.c (original)
+++ cfe/trunk/test/Sema/array-init.c Fri Jan 30 16:26:29 2009
@@ -20,7 +20,7 @@
int x3[x] = { 1, 2 }; // expected-error{{variable-sized object may not be initialized}}
- int x4 = { 1, 2 }; // expected-warning{{braces around scalar initializer}} expected-warning{{excess elements in array initializer}}
+ int x4 = { 1, 2 }; // expected-warning{{braces around scalar initializer}} expected-error{{excess elements in array initializer}}
int y[4][3] = {
{ 1, 3, 5 },
@@ -37,7 +37,7 @@
{ 2, 4, 6 },
{ 3, 5, 7 },
{ 4, 6, 8 },
- { 5 }, // expected-warning{{excess elements in array initializer}}
+ { 5 }, // expected-error{{excess elements in array initializer}}
};
struct threeElements {
@@ -53,17 +53,17 @@
void test() {
int y1[3] = {
- { 1, 2, 3 } // expected-warning{{braces around scalar initializer}} expected-warning{{excess elements in array initializer}}
+ { 1, 2, 3 } // expected-warning{{braces around scalar initializer}} expected-error{{excess elements in array initializer}}
};
int y3[4][3] = {
{ 1, 3, 5 },
{ 2, 4, 6 },
{ 3, 5, 7 },
{ 4, 6, 8 },
- { }, // expected-warning{{use of GNU empty initializer extension}} expected-warning{{excess elements in array initializer}}
+ { }, // expected-warning{{use of GNU empty initializer extension}} expected-error{{excess elements in array initializer}}
};
int y4[4][3] = {
- { 1, 3, 5, 2 }, // expected-warning{{excess elements in array initializer}}
+ { 1, 3, 5, 2 }, // expected-error{{excess elements in array initializer}}
{ 4, 6 },
{ 3, 5, 7 },
{ 4, 6, 8 },
@@ -178,7 +178,7 @@
char r3[][5] = {1,2,3,4,5,6};
int r3_sizecheck[(sizeof(r3) / sizeof(char[5])) == 2? 1 : -1];
char r3_2[sizeof r3 == 10 ? 1 : -1];
-float r4[1][2] = {1,{2},3,4}; //expected-warning{{braces around scalar initializer}} expected-warning{{excess elements in array initializer}}
+float r4[1][2] = {1,{2},3,4}; //expected-warning{{braces around scalar initializer}} expected-error{{excess elements in array initializer}}
char r5[][5] = {"aa", "bbb", "ccccc"};
char r6[sizeof r5 == 15 ? 1 : -1];
const char r7[] = "zxcv";
@@ -203,12 +203,12 @@
struct s3 {void (*a)(void);} t5 = {autoStructTest};
// FIXME: GCC extension; flexible array init. Once this is implemented, the warning should be removed.
// Note that clang objc implementation depends on this extension.
-struct {int a; int b[];} t6 = {1, {1, 2, 3}}; //expected-warning{{excess elements in array initializer}}
+struct {int a; int b[];} t6 = {1, {1, 2, 3}}; //expected-error{{excess elements in array initializer}}
union {char a; int b;} t7[] = {1, 2, 3};
int t8[sizeof t7 == (3*sizeof(int)) ? 1 : -1];
struct bittest{int : 31, a, :21, :12, b;};
-struct bittest bittestvar = {1, 2, 3, 4}; //expected-warning{{excess elements in array initializer}}
+struct bittest bittestvar = {1, 2, 3, 4}; //expected-error{{excess elements in array initializer}}
// Not completely sure what should happen here...
int u1 = {}; //expected-warning{{use of GNU empty initializer extension}} expected-error{{scalar initializer cannot be empty}}
@@ -243,7 +243,7 @@
};
static void sppp_ipv6cp_up();
-const struct {} ipcp = { sppp_ipv6cp_up }; //expected-warning{{empty struct extension}} expected-warning{{excess elements in array initializer}}
+const struct {} ipcp = { sppp_ipv6cp_up }; //expected-warning{{empty struct extension}} expected-error{{excess elements in array initializer}}
struct _Matrix { union { float m[4][4]; }; }; //expected-warning{{anonymous unions are a GNU extension in C}}
typedef struct _Matrix Matrix;
Modified: cfe/trunk/test/Sema/vector-init.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/vector-init.c?rev=63435&r1=63434&r2=63435&view=diff
==============================================================================
--- cfe/trunk/test/Sema/vector-init.c (original)
+++ cfe/trunk/test/Sema/vector-init.c Fri Jan 30 16:26:29 2009
@@ -9,7 +9,7 @@
int array_sizecheck[(sizeof(array) / sizeof(float4)) == 3? 1 : -1];
float4 array2[2] = { 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0,
- 9.0 }; // expected-warning {{excess elements in array initializer}}
+ 9.0 }; // expected-error {{excess elements in array initializer}}
float4 array3[2] = { {1.0, 2.0, 3.0}, 5.0, 6.0, 7.0, 8.0,
- 9.0 }; // expected-warning {{excess elements in array initializer}}
+ 9.0 }; // expected-error {{excess elements in array initializer}}
Modified: cfe/trunk/test/SemaCXX/dcl_init_aggr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/dcl_init_aggr.cpp?rev=63435&r1=63434&r2=63435&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/dcl_init_aggr.cpp (original)
+++ cfe/trunk/test/SemaCXX/dcl_init_aggr.cpp Fri Jan 30 16:26:29 2009
@@ -34,7 +34,7 @@
} smt = { 1, &smt.i };
// C++ [dcl.init.aggr]p6
-char cv[4] = { 'a', 's', 'd', 'f', 0 }; // expected-warning{{excess elements in array initializer}}
+char cv[4] = { 'a', 's', 'd', 'f', 0 }; // expected-error{{excess elements in array initializer}}
// C++ [dcl.init.aggr]p7
struct TooFew { int a; char* b; int c; };
@@ -103,5 +103,5 @@
u u1 = { 1 };
u u2 = u1;
u u3 = 1; // expected-error{{cannot initialize 'u3' with an rvalue of type 'int'}}
-u u4 = { 0, "asdf" }; // expected-warning{{excess elements in array initializer}}
+u u4 = { 0, "asdf" }; // expected-error{{excess elements in array initializer}}
u u5 = { "asdf" }; // expected-error{{incompatible type initializing 'char const [5]', expected 'int'}}
More information about the cfe-commits
mailing list