diff options
| author | Jason Merrill <jason@redhat.com> | 2008-04-07 16:50:21 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2008-04-07 16:50:21 -0400 |
| commit | c2b58ba219a15e6ecac98559942d72433d0574ae (patch) | |
| tree | e09d7e2d7530c9c5fb65a995d571eeb59bd4aa25 | |
| parent | d8ec5bf2315c43ff2c34dc2485ba833301d6b0b1 (diff) | |
| download | gcc-c2b58ba219a15e6ecac98559942d72433d0574ae.zip gcc-c2b58ba219a15e6ecac98559942d72433d0574ae.tar.gz gcc-c2b58ba219a15e6ecac98559942d72433d0574ae.tar.bz2 | |
re PR c++/35734 (ICE with copy constructor in derived class)
PR c++/35734
* class.c (type_has_user_nondefault_constructor): A template
counts as a nondefault constructor.
From-SVN: r133987
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/class.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/warn/ctor1.C | 13 |
4 files changed, 27 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6702af2..ee51b00 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2008-04-07 Jason Merrill <jason@redhat.com> + + PR c++/35734 + * class.c (type_has_user_nondefault_constructor): A template + counts as a nondefault constructor. + 2008-04-04 Paolo Bonzini <bonzini@gnu.org> * decl.c (cxx_push_function_context): Delete. diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 69acf11..a6dbc13 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -4060,7 +4060,9 @@ type_has_user_nondefault_constructor (tree t) { tree fn = OVL_CURRENT (fns); if (!DECL_ARTIFICIAL (fn) - && skip_artificial_parms_for (fn, DECL_ARGUMENTS (fn)) != NULL_TREE) + && (TREE_CODE (fn) == TEMPLATE_DECL + || (skip_artificial_parms_for (fn, DECL_ARGUMENTS (fn)) + != NULL_TREE))) return true; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a71cae2..6fc0cc1 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-04-07 Jason Merrill <jason@redhat.com> + + PR c++/35734 + * g++.dg/warn/ctor1.C: New. + 2008-04-07 Kai Tietz <kai.tietz@onevision.com> PR/35842 diff --git a/gcc/testsuite/g++.dg/warn/ctor1.C b/gcc/testsuite/g++.dg/warn/ctor1.C new file mode 100644 index 0000000..00a6c95 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/ctor1.C @@ -0,0 +1,13 @@ +// PR c++/35734 +// { dg-options "-W" } + +struct A +{ + A(); + template<typename T> A(const T&); +}; + +struct B : A +{ + B(const B&) {} // { dg-warning "base class" } +}; |