diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2016-02-04 12:04:07 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2016-02-04 12:04:07 +0100 |
| commit | d1243d278cb5f6af0b17c94ed48b9e40a5a92639 (patch) | |
| tree | 299dd662d383fa350ee1ad52599d0b969caaf1b2 | |
| parent | cc9c0829f714743c1212451883d0302dbef47fd0 (diff) | |
| download | gcc-d1243d278cb5f6af0b17c94ed48b9e40a5a92639.zip gcc-d1243d278cb5f6af0b17c94ed48b9e40a5a92639.tar.gz gcc-d1243d278cb5f6af0b17c94ed48b9e40a5a92639.tar.bz2 | |
class.c (find_flexarrays): Don't declare dom variable.
* class.c (find_flexarrays): Don't declare dom variable.
(diagnose_flexarray): Likewise.
From-SVN: r233135
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/class.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c8ccf40..8637c4f 100644 --- 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 67b3f81..b705d6b 100644 --- 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"); |