From bfbe1b687b599be65450795a562db10bcf2fde1d Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Wed, 11 Feb 2009 00:23:38 -0500
Subject: [PATCH] re PR c++/38649 (Trouble with defaulted constructors)

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

From-SVN: r144092
---
 gcc/cp/ChangeLog                        | 3 +++
 gcc/cp/class.c                          | 7 ++++---
 gcc/testsuite/ChangeLog                 | 3 +++
 gcc/testsuite/g++.dg/cpp0x/defaulted8.C | 8 ++++++++
 4 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/defaulted8.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3c1975ff708..513465d82be 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 f56edc392a1..d852acd9065 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 4cb62582130..52817fad5b8 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 00000000000..f446f815691
--- /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" }
+};