aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2011-02-19 17:39:50 -0500
committerJason Merrill <jason@gcc.gnu.org>2011-02-19 17:39:50 -0500
commit06a85dd37ff6f5fb6c418cb218f707e428cf20c4 (patch)
treee564a89db28dae08f88873e6bd140aed0babadb0 /gcc/cp
parente67401c78f7966e75ad348b3b8953741c89342e2 (diff)
downloadgcc-06a85dd37ff6f5fb6c418cb218f707e428cf20c4.zip
gcc-06a85dd37ff6f5fb6c418cb218f707e428cf20c4.tar.gz
gcc-06a85dd37ff6f5fb6c418cb218f707e428cf20c4.tar.bz2
re PR c++/47503 ([C++0x] ICE: in adjust_temp_type, at cp/semantics.c:5876 with -fno-elide-constructors)
PR c++/47503 * semantics.c (cxx_eval_call_expression): Shortcut trivial copy. From-SVN: r170330
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/semantics.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0f6ece2..938d3f2 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-19 Jason Merrill <jason@redhat.com>
+
+ PR c++/47503
+ * semantics.c (cxx_eval_call_expression): Shortcut trivial copy.
+
2011-02-18 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/47795
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index e102ba3..8944690 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -6019,6 +6019,10 @@ cxx_eval_call_expression (const constexpr_call *old_call, tree t,
return t;
}
+ /* Shortcut trivial copy constructor/op=. */
+ if (call_expr_nargs (t) == 2 && trivial_fn_p (fun))
+ return convert_from_reference (get_nth_callarg (t, 1));
+
/* If in direct recursive call, optimize definition search. */
if (old_call != NULL && old_call->fundef->decl == fun)
new_call.fundef = old_call->fundef;