patches/gcc-4.8.3-universal_initializer.diff

   1 Fix for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119
   2 wrong warning when using the universal zero initializer {0}
   3
   4 Backported to GCC 4.8.3
   5
   6 Subject: 2014-06-05  S. Gilles  <sgilles@terpmail.umd.edu>
   7 X-Git-Url: http://repo.or.cz/w/official-gcc.git/commitdiff_plain/95cdf3fdf2d440eb7775def8e35ab970651c33d9?hp=14a3093e9943937cbc63dfbf4d51ca60f8325b29
   8 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@211289 138bc75d-0d04-0410-961f-82ee72b054a4
   9
  10 --- gcc-4.8.3.org/gcc/c/c-typeck.c      2014-08-03 20:52:09.257042137 +0200
  11 +++ gcc-4.8.3/gcc/c/c-typeck.c  2014-08-03 20:57:10.645042614 +0200
  12 @@ -62,9 +62,9 @@
  13     if expr.original_code == SIZEOF_EXPR.  */
  14  tree c_last_sizeof_arg;
  15
  16 -/* Nonzero if we've already printed a "missing braces around initializer"
  17 -   message within this initializer.  */
  18 -static int missing_braces_mentioned;
  19 +/* Nonzero if we might need to print a "missing braces around
  20 +   initializer" message within this initializer.  */
  21 +static int found_missing_braces;
  22
  23  static int require_constant_value;
  24  static int require_constant_elements;
  25 @@ -6379,6 +6379,9 @@
  26  /* 1 if this constructor is erroneous so far.  */
  27  static int constructor_erroneous;
  28
  29 +/* 1 if this constructor is the universal zero initializer { 0 }.  */
  30 +static int constructor_zeroinit;
  31 +
  32  /* Structure for managing pending initializer elements, organized as an
  33     AVL tree.  */
  34
  35 @@ -6540,7 +6543,7 @@
  36    constructor_stack = 0;
  37    constructor_range_stack = 0;
  38
  39 -  missing_braces_mentioned = 0;
  40 +  found_missing_braces = 0;
  41
  42    spelling_base = 0;
  43    spelling_size = 0;
  44 @@ -6635,6 +6638,7 @@
  45    constructor_type = type;
  46    constructor_incremental = 1;
  47    constructor_designated = 0;
  48 +  constructor_zeroinit = 1;
  49    designator_depth = 0;
  50    designator_erroneous = 0;
  51
  52 @@ -6832,11 +6836,8 @@
  53         set_nonincremental_init (braced_init_obstack);
  54      }
  55
  56 -  if (implicit == 1 && warn_missing_braces && !missing_braces_mentioned)
  57 -    {
  58 -      missing_braces_mentioned = 1;
  59 -      warning_init (OPT_Wmissing_braces, "missing braces around initializer");
  60 -    }
  61 +  if (implicit == 1)
  62 +    found_missing_braces = 1;
  63
  64    if (TREE_CODE (constructor_type) == RECORD_TYPE
  65            || TREE_CODE (constructor_type) == UNION_TYPE)
  66 @@ -6969,16 +6970,23 @@
  67         }
  68      }
  69
  70 +  if (vec_safe_length (constructor_elements) != 1)
  71 +    constructor_zeroinit = 0;
  72 +
  73 +  /* Warn when some structs are initialized with direct aggregation.  */
  74 +  if (!implicit && found_missing_braces && warn_missing_braces
  75 +      && !constructor_zeroinit)
  76 +    {
  77 +      warning_init (OPT_Wmissing_braces,
  78 +                   "missing braces around initializer");
  79 +    }
  80 +
  81    /* Warn when some struct elements are implicitly initialized to zero.  */
  82    if (warn_missing_field_initializers
  83        && constructor_type
  84        && TREE_CODE (constructor_type) == RECORD_TYPE
  85        && constructor_unfilled_fields)
  86      {
  87 -       bool constructor_zeroinit =
  88 -        (vec_safe_length (constructor_elements) == 1
  89 -         && integer_zerop ((*constructor_elements)[0].value));
  90 -
  91         /* Do not warn for flexible array members or zero-length arrays.  */
  92         while (constructor_unfilled_fields
  93                && (!DECL_SIZE (constructor_unfilled_fields)
  94 @@ -8093,6 +8101,9 @@
  95    designator_depth = 0;
  96    designator_erroneous = 0;
  97
  98 +  if (!implicit && value.value && !integer_zerop (value.value))
  99 +    constructor_zeroinit = 0;
 100 +
 101    /* Handle superfluous braces around string cst as in
 102       char x[] = {"foo"}; */
 103    if (string_flag