diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/class.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/pr88699.C | 13 |
4 files changed, 25 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index dec8d64..6893b2e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2019-01-17 David Malcolm <dmalcolm@redhat.com> + + PR c++/88699 + * class.c (add_method): Don't use DECL_DESTRUCTOR_P on + USING_DECLs. + 2019-01-17 Nathan Sidwell <nathan@acm.org> PR c++/86610 diff --git a/gcc/cp/class.c b/gcc/cp/class.c index e7897f2..e8773c2 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -1134,7 +1134,7 @@ add_method (tree type, tree method, bool via_using) } /* A class should never have more than one destructor. */ - gcc_assert (!current_fns || !DECL_DESTRUCTOR_P (method)); + gcc_assert (!current_fns || via_using || !DECL_DESTRUCTOR_P (method)); current_fns = ovl_insert (method, current_fns, via_using); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 31b171b..176d2f8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-01-17 David Malcolm <dmalcolm@redhat.com> + + PR c++/88699 + * g++.dg/template/pr88699.C: New test. + 2019-01-17 Martin Sebor <msebor@redhat.com> PR tree-optimization/88800 diff --git a/gcc/testsuite/g++.dg/template/pr88699.C b/gcc/testsuite/g++.dg/template/pr88699.C new file mode 100644 index 0000000..ecd26ce --- /dev/null +++ b/gcc/testsuite/g++.dg/template/pr88699.C @@ -0,0 +1,13 @@ +// { dg-do compile } + +template <typename> +struct A { + void operator= (int); + template <int> class B; +}; +template <typename C> +template <int> +struct A<C>::B : A { + using A::operator=; + void operator= (B); +}; |