From: Jason Merrill <jason@redhat.com>
Date: Tue, 9 Jun 2009 18:18:45 +0000 (-0400)
Subject: re PR c++/40381 (Revision 142379 caused ICE with deleted functions)
X-Git-Tag: releases/gcc-4.5.0~5292
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=869fef887fff96f4c8914ef2be5beeef4b08228a;p=thirdparty%2Fgcc.git

re PR c++/40381 (Revision 142379 caused ICE with deleted functions)

	PR c++/40381
	* decl2.c (mark_used): Return after complaining about deleted fn.

From-SVN: r148319
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c4e84aa14b8e..76f83c60a535 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-09  Jason Merrill  <jason@redhat.com>
+
+	PR c++/40381
+	* decl2.c (mark_used): Return after complaining about deleted fn.
+
 2009-06-08  Jason Merrill  <jason@redhat.com>
 
 	* parser.c (cp_parser_type_id_1): 'auto' type is ok with a
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index d368ea803bba..b4f4404d1edb 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -3809,6 +3809,7 @@ mark_used (tree decl)
     {
       error ("deleted function %q+D", decl);
       error ("used here");
+      return;
     }
   /* If we don't need a value, then we don't need to synthesize DECL.  */
   if (skip_evaluation)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8ecbde7ad3a1..1d5b50a59d5a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-09  Jason Merrill  <jason@redhat.com>
+
+	* g++.dg/cpp0x/defaulted10.C: New.
+
 2009-06-09  Martin Jambor  <mjambor@suse.cz>
 
 	* testsuite/gcc.c-torture/compile/pr40351.c: New file.
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted10.C b/gcc/testsuite/g++.dg/cpp0x/defaulted10.C
new file mode 100644
index 000000000000..d169e0c60078
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted10.C
@@ -0,0 +1,14 @@
+// PR c++/40381
+// { dg-options "-std=gnu++0x" }
+
+struct A
+{
+  template<typename T> void foo(T) = delete; // { dg-error "previously|deleted" }
+};
+
+template<typename T> void A::foo(T) {} // { dg-error "redefinition" }
+
+void bar()
+{
+  A().foo(0);			// { dg-error "used" }
+}