From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 11 Feb 2009 05:23:38 +0000 (+0000)
Subject:         PR c++/38649
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=acbcea6284916f16ee1df5b68bd576a35042cf6a;p=thirdparty%2Fgcc.git

    PR c++/38649
        * class.c (defaultable_fn_p): Handle ... properly.


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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3c1975ff708f..513465d82be4 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2009-02-10  Jason Merrill  <jason@redhat.com>
 
+	PR c++/38649
+	* class.c (defaultable_fn_p): Handle ... properly.
+
 	PR c++/36744
 	* tree.c (lvalue_p_1): Condition rvalue ref handling on
 	treat_class_rvalues_as_lvalues, too.
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index f56edc392a15..d852acd9065a 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -4138,10 +4138,11 @@ defaultable_fn_p (tree fn)
 {
   if (DECL_CONSTRUCTOR_P (fn))
     {
-      if (skip_artificial_parms_for (fn, DECL_ARGUMENTS (fn))
-	  == NULL_TREE)
+      if (FUNCTION_FIRST_USER_PARMTYPE (fn) == void_list_node)
 	return true;
-      else if (copy_fn_p (fn) > 0)
+      else if (copy_fn_p (fn) > 0
+	       && (TREE_CHAIN (FUNCTION_FIRST_USER_PARMTYPE (fn))
+		   == void_list_node))
 	return true;
       else
 	return false;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4cb62582130f..52817fad5b86 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2009-02-11  Jason Merrill  <jason@redhat.com>
 
+	PR c++/38649
+	* g++.dg/cpp0x/defaulted8.C: New test.
+
 	PR c++/36744
 	* g++.dg/cpp0x/rv9p.C: New test.
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted8.C b/gcc/testsuite/g++.dg/cpp0x/defaulted8.C
new file mode 100644
index 000000000000..f446f815691c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted8.C
@@ -0,0 +1,8 @@
+// PR c++/38649
+// { dg-options "-std=c++0x" }
+
+struct A
+{
+  A(...) = default;		// { dg-error "cannot be defaulted" }
+  A(const A&, ...) = default;	// { dg-error "cannot be defaulted" }
+};