From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 8 Dec 2010 20:00:27 +0000 (+0000)
Subject: 	PR c++/46736
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=21f80a31bf2440b3b8a62f20fa6298be6cb769b6;p=thirdparty%2Fgcc.git

	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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@167601 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 47a915aca3a1..b04f33a46d5d 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 5b4dfb7b00a0..b72b5884b7cb 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 ed75a64a03fb..dc723553cbb0 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 313af808f843..f0aeca5c2109 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 000000000000..3e740331d8a3
--- /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();
+}