diff options
| author | Jason Merrill <jason@redhat.com> | 2011-02-19 17:39:50 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-02-19 17:39:50 -0500 |
| commit | 06a85dd37ff6f5fb6c418cb218f707e428cf20c4 (patch) | |
| tree | e564a89db28dae08f88873e6bd140aed0babadb0 /gcc | |
| parent | e67401c78f7966e75ad348b3b8953741c89342e2 (diff) | |
| download | gcc-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')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/regress/no-elide1.C | 14 |
4 files changed, 27 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; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index db9b51d..2f82fed 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-02-19 Jason Merrill <jason@redhat.com> + + * g++.dg/cpp0x/regress/no-elide1.C: New. + 2011-02-19 Alexandre Oliva <aoliva@redhat.com> PR tree-optimization/46620 diff --git a/gcc/testsuite/g++.dg/cpp0x/regress/no-elide1.C b/gcc/testsuite/g++.dg/cpp0x/regress/no-elide1.C new file mode 100644 index 0000000..50df950 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/regress/no-elide1.C @@ -0,0 +1,14 @@ +// PR c++/47503 +// { dg-options "-std=c++0x -fno-elide-constructors" } + +struct A +{ + int i; + A (); +}; + +struct B +{ + A a; + B (A &aa) : a (aa) { } +}; |