class.c (find_flexarrays): Don't declare dom variable.

	* class.c (find_flexarrays): Don't declare dom variable.
	(diagnose_flexarray): Likewise.

From-SVN: r233135

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c8ccf405d841117d833405213ed86840cb19ccf4..8637c4fffa0faf9a6066829ae3bb035609863294 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-04  Jakub Jelinek  <jakub@redhat.com>
+
+       * class.c (find_flexarrays): Don't declare dom variable.
+       (diagnose_flexarray): Likewise.
+
 2016-02-02  Martain Sebor  <msebor@redhat.com>
 
        PR c++/69251

diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 67b3f81de25729f7edc7bf007032a94d816433dc..b705d6bba596760d5b5f27e9ecb27ae2e30a9f64 100644 (file)
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -6683,7 +6683,7 @@ find_flexarrays (tree t, flexmems_t *fmem)
        continue;
 
       /* Determine the upper bound of the array if it has one.  */
-      if (tree dom = TYPE_DOMAIN (fldtype))
+      if (TYPE_DOMAIN (fldtype))
        {
          if (fmem->array)
            {
@@ -6694,7 +6694,7 @@ find_flexarrays (tree t, flexmems_t *fmem)
              if (!fmem->after)
                fmem->after = fld;
            }
-         else if (integer_all_onesp (TYPE_MAX_VALUE (dom)))
+         else if (integer_all_onesp (TYPE_MAX_VALUE (TYPE_DOMAIN (fldtype))))
            /* Remember the first zero-length array unless a flexible array
               member has already been seen.  */
            fmem->array = fld;
@@ -6732,7 +6732,7 @@ diagnose_flexarrays (tree t, const flexmems_t *fmem)
 
   const char *msg = 0;
 
-  if (const_tree dom = TYPE_DOMAIN (TREE_TYPE (fmem->array)))
+  if (TYPE_DOMAIN (TREE_TYPE (fmem->array)))
     {
       if (fmem->after)
        msg = G_("zero-size array member %qD not at end of %q#T");