On Fri, Apr 23, 2021 at 05:24:00PM -0400, Jason Merrill via Gcc wrote:
> On Fri, Apr 23, 2021 at 7:55 AM Jakub Jelinek <ja...@redhat.com> wrote:
> >
> > Status
> > ======
> >
> > GCC 8.5 release and closing of the 8 branch is several months overdue,
> > we don't have enough time to maintain trunk and 4 supported release
> > branches.
> > Therefore, I'd like to do 8.5-rc1 on 7th of May and release 8.5 and close
> > the branch a week after that.
> > We have one P1 bug though - P98358 - it is unclear if just changing the
> > testcase is all that is needed or if some C++ FE changes are needed.
>
> The error message quoted in the PR looks correct, so I think changing
> the testcase is sufficient.
Ok, thanks, I've committed the following patch to 8.5 after testing it on
x86_64-linux:
2021-04-30 Jakub Jelinek <ja...@redhat.com>
PR c++/98358
* g++.dg/template/pr98297.C: Expect error about shadowing template
template
parameter rather than does not declare anything error.
--- gcc/testsuite/g++.dg/template/pr98297.C.jj 2021-04-22 15:48:48.099179790
+0200
+++ gcc/testsuite/g++.dg/template/pr98297.C 2021-04-30 15:13:57.037421448
+0200
@@ -2,5 +2,5 @@
// { dg-do compile { target c++11 } }
template <template <class> class a>
struct [[b]]
-a <int>; // { dg-error "does not declare anything" }
+a <int>; // { dg-error "name of class shadows template template parameter" }
// { dg-warning "ignored" "" { target *-*-* } .-1 }
Jakub
