diff options
| author | Jason Merrill <jason@redhat.com> | 2010-12-08 15:00:27 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2010-12-08 15:00:27 -0500 |
| commit | f4842525074ad8c1d7365ea5ea51a2d5b023293b (patch) | |
| tree | b8d2efe090c574eab51fe46bc1d6c241774c781d /gcc | |
| parent | 6a68a5c39771f9dbcea080430cc0161a2ab1d3a1 (diff) | |
| download | gcc-f4842525074ad8c1d7365ea5ea51a2d5b023293b.zip gcc-f4842525074ad8c1d7365ea5ea51a2d5b023293b.tar.gz gcc-f4842525074ad8c1d7365ea5ea51a2d5b023293b.tar.bz2 | |
re PR c++/46736 ([c++0x] move constructor is not implicitly deleted when it should be)
PR c++/46736
* decl.c (cp_finish_decl): Complain about an implicitly deleted
method defaulted outside the class.
* method.c (maybe_explain_implicit_delete): Don't check DECL_INITIAL.
From-SVN: r167601
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 4 | ||||
| -rw-r--r-- | gcc/cp/method.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/defaulted21.C | 20 |
5 files changed, 36 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 47a915a..b04f33a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2010-12-08 Jason Merrill <jason@redhat.com> + + PR c++/46736 + * decl.c (cp_finish_decl): Complain about an implicitly deleted + method defaulted outside the class. + * method.c (maybe_explain_implicit_delete): Don't check DECL_INITIAL. + 2010-12-07 Joseph Myers <joseph@codesourcery.com> * rtti.c: Don't include assert.h. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 5b4dfb7..b72b588 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -6094,7 +6094,9 @@ cp_finish_decl (tree decl, tree init, bool init_const_expr_p, { /* An out-of-class default definition is defined at the point where it is explicitly defaulted. */ - if (DECL_INITIAL (decl) == error_mark_node) + if (DECL_DELETED_FN (decl)) + maybe_explain_implicit_delete (decl); + else if (DECL_INITIAL (decl) == error_mark_node) synthesize_method (decl); } else diff --git a/gcc/cp/method.c b/gcc/cp/method.c index ed75a64..dc72355 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -1318,8 +1318,7 @@ maybe_explain_implicit_delete (tree decl) /* If decl is a clone, get the primary variant. */ decl = DECL_ORIGIN (decl); gcc_assert (DECL_DELETED_FN (decl)); - if (DECL_DEFAULTED_FN (decl) - && DECL_INITIAL (decl) == NULL_TREE) + if (DECL_DEFAULTED_FN (decl)) { /* Not marked GTY; it doesn't need to be GC'd or written to PCH. */ static htab_t explained_htab; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 313af80..f0aeca5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-12-08 Jason Merrill <jason@redhat.com> + + PR c++/46736 + * g++.dg/cpp0x/defaulted21.C: New. + 2010-12-08 Wei Guozhi <carrot@google.com> PR target/46631 diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted21.C b/gcc/testsuite/g++.dg/cpp0x/defaulted21.C new file mode 100644 index 0000000..3e74033 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/defaulted21.C @@ -0,0 +1,20 @@ +// PR c++/46736 +// { dg-options -std=c++0x } + +struct U { + U(); + U(U const&); +}; + +struct X { + U const u; + X(); + X(X&&); +}; + +X::X(X&&)=default; // { dg-error "implicitly deleted" } +// { dg-error "does not have a move constructor" "" { target *-*-* } 15 } + +X f() { + return X(); +} |