From 84937de246b5aa038ef6cfcec3a20297a690bde0 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Thu, 9 Oct 2014 08:25:50 +0000 Subject: [PATCH] re PR c/63480 (-Wmissing-field-initializers should not warn about intentionally empty initializers (or that should be a separate option)) PR c/63480 * c-typeck.c (pop_init_level): Don't warn about initializing with { }. * gcc.dg/pr63480.c: New test. From-SVN: r216031 --- gcc/c/ChangeLog | 6 ++++++ gcc/c/c-typeck.c | 8 ++++++-- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/pr63480.c | 14 ++++++++++++++ 4 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/pr63480.c diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index 3a09125b15d..91ed9d21c69 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,9 @@ +2014-10-09 Marek Polacek + + PR c/63480 + * c-typeck.c (pop_init_level): Don't warn about initializing + with { }. + 2014-10-07 Marek Polacek PR c/59717 diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c index b3b82bba2cc..5c0697a9643 100644 --- a/gcc/c/c-typeck.c +++ b/gcc/c/c-typeck.c @@ -7436,7 +7436,11 @@ pop_init_level (location_t loc, int implicit, } } - if (vec_safe_length (constructor_elements) != 1) + /* Initialization with { } counts as zeroinit. */ + if (vec_safe_length (constructor_elements) == 0) + constructor_zeroinit = 1; + /* If the constructor has more than one element, it can't be { 0 }. */ + else if (vec_safe_length (constructor_elements) != 1) constructor_zeroinit = 0; /* Warn when some structs are initialized with direct aggregation. */ @@ -7463,7 +7467,7 @@ pop_init_level (location_t loc, int implicit, /* Do not warn if this level of the initializer uses member designators; it is likely to be deliberate. */ && !constructor_designated - /* Do not warn about initializing with ` = {0}'. */ + /* Do not warn about initializing with { 0 } or with { }. */ && !constructor_zeroinit) { if (warning_at (input_location, OPT_Wmissing_field_initializers, diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a8870ea3de7..ea731bf0abd 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-10-09 Marek Polacek + + PR c/63480 + * gcc.dg/pr63480.c: New test. + 2014-10-09 Richard Biener PR tree-optimization/63445 diff --git a/gcc/testsuite/gcc.dg/pr63480.c b/gcc/testsuite/gcc.dg/pr63480.c new file mode 100644 index 00000000000..e720e0ddd3d --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr63480.c @@ -0,0 +1,14 @@ +/* PR c/63480 */ +/* { dg-do compile } */ +/* { dg-options "-Wmissing-field-initializers" } */ + +/* Test that we don't warn about initializing with { }. */ + +struct S { int a, b, c; } s = { }; + +void +foo (void) +{ + struct S s = { }; + struct S s2 = (struct S){ }; +} -- 2.30.2