From 4b0b30ef85db2eec7cd69ee3049b69ea46e9a752 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Mon, 18 Jan 2016 10:54:26 -0500 Subject: [PATCH] * cp-gimplify.c (cp_fold) [CONSTRUCTOR]: Don't clobber the input. From-SVN: r232524 --- gcc/cp/ChangeLog | 2 ++ gcc/cp/cp-gimplify.c | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index fbc1a7c3ada7..9325bb0bf3c0 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,7 @@ 2016-01-18 Jason Merrill + * 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 2dc53ae5fdf0..5c4d3c1bb1f8 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 *elts = CONSTRUCTOR_ELTS (x); + vec *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: -- 2.47.2