diff options
| author | Jason Merrill <jason@redhat.com> | 2009-02-11 00:23:38 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2009-02-11 00:23:38 -0500 |
| commit | bfbe1b687b599be65450795a562db10bcf2fde1d (patch) | |
| tree | 4cdc27aa10ba93561cf453b48b2dbcc910118a8f | |
| parent | 952e24fed662bec5e6076a1adb6b5642a926c86e (diff) | |
| download | gcc-bfbe1b687b599be65450795a562db10bcf2fde1d.zip gcc-bfbe1b687b599be65450795a562db10bcf2fde1d.tar.gz gcc-bfbe1b687b599be65450795a562db10bcf2fde1d.tar.bz2 | |
re PR c++/38649 (Trouble with defaulted constructors)
PR c++/38649
* class.c (defaultable_fn_p): Handle ... properly.
From-SVN: r144092
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/class.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/defaulted8.C | 8 |
4 files changed, 18 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3c1975f..513465d 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 f56edc3..d852acd 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 4cb6258..52817fa 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 0000000..f446f81 --- /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" } +}; |