From a5c4274085d61311898360920cef526334674cd3 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Wed, 23 Aug 2006 00:27:43 -0400 Subject: [PATCH] re PR c++/23372 (Temporary aggregate copy not elided when passing parameters by value) PR c++/23372 * call.c (build_over_call): Don't make a copy here if build_call will make one too. From-SVN: r116342 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/call.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f50554cab56..ff60084b83c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2006-08-22 Jason Merrill + + PR c++/23372 + * call.c (build_over_call): Don't make a copy here if build_call + will make one too. + 2006-08-22 Andrew Pinski PR C++/28450 diff --git a/gcc/cp/call.c b/gcc/cp/call.c index ea89cdfed77..a91ecd015f8 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -4847,6 +4847,12 @@ build_over_call (struct z_candidate *cand, int flags) tree type = TREE_VALUE (parm); conv = convs[i]; + + /* Don't make a copy here if build_call is going to. */ + if (conv->kind == ck_rvalue + && !TREE_ADDRESSABLE (complete_type (type))) + conv = conv->u.next; + val = convert_like_with_context (conv, TREE_VALUE (arg), fn, i - is_method);