From 5b1a758d26d594569fbf2ca1381fa27ec416fd23 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Wed, 28 Mar 2018 05:05:30 +0000 Subject: [PATCH] [PR c++/84789] adjust testcase for -fconcepts When compiling with -fconcepts, cp_parser_template_declaration_after_export calls cp_parser_template_introduction and that preparses qualified-ids not preceded by typename in such a way that, when we get to cp_parser_parse_and_diagnose_invalid_type_name and then cp_parser_diagnose_invalid_type_name, the nested name specifier no longer carries the previous template-dependent context, so we don't stand a chance to suggest the use of 'typename' any more. Thus, tolerate in the testcase the poorer error messages we get. for gcc/testsuite/ChangeLog PR c++/84789 * g++.dg/template/pr84789.C: Adjust for testing with -fconcepts too. From-SVN: r258915 --- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/g++.dg/template/pr84789.C | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 252854e34c8..0fea4189860 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2018-03-28 Alexandre Oliva + PR c++/84789 + * g++.dg/template/pr84789.C: Adjust for testing with + -fconcepts too. + PR c++/84973 * g++.dg/template/pr84973.C: New. * g++.dg/template/pr84973-2.C: New. diff --git a/gcc/testsuite/g++.dg/template/pr84789.C b/gcc/testsuite/g++.dg/template/pr84789.C index bc1567f3fe7..63b9832fecf 100644 --- a/gcc/testsuite/g++.dg/template/pr84789.C +++ b/gcc/testsuite/g++.dg/template/pr84789.C @@ -9,5 +9,5 @@ template struct B : A {}; template struct C : B { - B::A::I::I i; // { dg-error "typename" } + B::A::I::I i; // { dg-error "not a class type|does not name a type|typename" } }; -- 2.30.2