diff options
| author | Jason Merrill <jason@redhat.com> | 2016-01-18 10:54:26 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2016-01-18 10:54:26 -0500 |
| commit | 4b0b30ef85db2eec7cd69ee3049b69ea46e9a752 (patch) | |
| tree | e46a32ffd5183cc7dd2f2917d4d5e5063add2b6f | |
| parent | 8d8f3235500c7aedcd93431b9c94c5839c833577 (diff) | |
| download | gcc-4b0b30ef85db2eec7cd69ee3049b69ea46e9a752.zip gcc-4b0b30ef85db2eec7cd69ee3049b69ea46e9a752.tar.gz gcc-4b0b30ef85db2eec7cd69ee3049b69ea46e9a752.tar.bz2 | |
* cp-gimplify.c (cp_fold) [CONSTRUCTOR]: Don't clobber the input.
From-SVN: r232524
| -rw-r--r-- | gcc/cp/ChangeLog | 2 | ||||
| -rw-r--r-- | gcc/cp/cp-gimplify.c | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index fbc1a7c..9325bb0 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,7 @@ 2016-01-18 Jason Merrill <jason@redhat.com> + * cp-gimplify.c (cp_fold) [CONSTRUCTOR]: Don't clobber the input. + * cp-gimplify.c (cp_fold): Remove unnecessary special cases. PR c++/68767 diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c index 2dc53ae..5c4d3c1 100644 --- a/gcc/cp/cp-gimplify.c +++ b/gcc/cp/cp-gimplify.c @@ -2125,9 +2125,22 @@ cp_fold (tree x) { unsigned i; constructor_elt *p; + bool changed = false; vec<constructor_elt, va_gc> *elts = CONSTRUCTOR_ELTS (x); + vec<constructor_elt, va_gc> *nelts = NULL; + vec_safe_reserve (nelts, vec_safe_length (elts)); FOR_EACH_VEC_SAFE_ELT (elts, i, p) - p->value = cp_fold (p->value); + { + tree op = cp_fold (p->value); + constructor_elt e = { p->index, op }; + nelts->quick_push (e); + if (op != p->value) + changed = true; + } + if (changed) + x = build_constructor (TREE_TYPE (x), nelts); + else + vec_free (nelts); break; } case TREE_VEC: |