aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2015-07-14 13:35:38 -0400
committerJason Merrill <jason@gcc.gnu.org>2015-07-14 13:35:38 -0400
commite056dfd06a163af1204b2af5b7e44322a3e39cd1 (patch)
treed692e4f5ab7107be30638473ef97dbed9a900c58 /gcc/cp
parent87679b76c3469211fe25d876d717b64fcbd336c7 (diff)
downloadgcc-e056dfd06a163af1204b2af5b7e44322a3e39cd1.zip
gcc-e056dfd06a163af1204b2af5b7e44322a3e39cd1.tar.gz
gcc-e056dfd06a163af1204b2af5b7e44322a3e39cd1.tar.bz2
* call.c (build_new_method_call_1): Call reshape_init.
From-SVN: r225784
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/call.c5
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d2e5502..904fc76 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-14 Jason Merrill <jason@redhat.com>
+
+ * call.c (build_new_method_call_1): Call reshape_init.
+
2015-07-14 Paolo Carlini <paolo.carlini@oracle.com>
* pt.c (check_template_shadow): Emit error + inform instead of
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index fce42da..8dda1de 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -8069,7 +8069,10 @@ build_new_method_call_1 (tree instance, tree fns, vec<tree, va_gc> **args,
/* If BASETYPE is an aggregate, we need to do aggregate
initialization. */
else if (CP_AGGREGATE_TYPE_P (basetype))
- init = digest_init (basetype, init_list, complain);
+ {
+ init = reshape_init (basetype, init_list, complain);
+ init = digest_init (basetype, init, complain);
+ }
if (init)
{