summaryrefslogtreecommitdiffstats
path: root/gcc/cp/cvt.c
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/cp/cvt.c')
-rw-r--r--gcc/cp/cvt.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c
index 220edddb535..497179b3bbc 100644
--- a/gcc/cp/cvt.c
+++ b/gcc/cp/cvt.c
@@ -902,9 +902,11 @@ convert_to_void (tree expr, const char *implicit)
if (TREE_CODE (init) == AGGR_INIT_EXPR
&& !AGGR_INIT_VIA_CTOR_P (init))
{
- tree fn = TREE_OPERAND (init, 0);
- expr = build3 (CALL_EXPR, TREE_TYPE (TREE_TYPE (TREE_TYPE (fn))),
- fn, TREE_OPERAND (init, 1), NULL_TREE);
+ tree fn = AGGR_INIT_EXPR_FN (init);
+ expr = build_call_array (TREE_TYPE (TREE_TYPE (TREE_TYPE (fn))),
+ fn,
+ aggr_init_expr_nargs (init),
+ AGGR_INIT_EXPR_ARGP (init));
}
}
break;
OpenPOWER on IntegriCloud