From c8a3d8890e4548cf07c8aa01fbc5716e23364b51 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Tue, 21 May 2002 17:26:18 +0000 Subject: [PATCH] init.c (build_vec_init): Test for trivial copy-assignment when copy-assigning arrays. * init.c (build_vec_init): Test for trivial copy-assignment when copy-assigning arrays. From-SVN: r53691 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/init.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 09f038c0a08..cd76ef214e5 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2002-05-21 Alexandre Oliva + + * init.c (build_vec_init): Test for trivial copy-assignment when + copy-assigning arrays. + 2002-05-20 Andreas Jaeger * init.c (build_default_init): Remove unused variable. diff --git a/gcc/cp/init.c b/gcc/cp/init.c index 526d68f390b..b8ec78a28fb 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -2774,7 +2774,10 @@ build_vec_init (base, init, from_array) if (init && TREE_CODE (init) == CONSTRUCTOR && TREE_TYPE (init) == NULL_TREE) init = digest_init (atype, init, 0); - if (init && !TYPE_NEEDS_CONSTRUCTING (type) + if (init + && (from_array == 2 + ? (!CLASS_TYPE_P (type) || !TYPE_HAS_COMPLEX_ASSIGN_REF (type)) + : !TYPE_NEEDS_CONSTRUCTING (type)) && ((TREE_CODE (init) == CONSTRUCTOR /* Don't do this if the CONSTRUCTOR might contain something that might throw and require us to clean up. */ -- 2.30.2