aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/parser.c3
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/g++.dg/concepts/diagnostic11.C6
4 files changed, 18 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5b9ff5a..2a5b417 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2020-04-25 Patrick Palka <ppalka@redhat.com>
+
+ * parser.c (cp_parser_diagnose_invalid_type_name): Suggest enabling
+ concepts if the invalid identifier is 'requires'.
+
2020-04-25 Jakub Jelinek <jakub@redhat.com>
PR c++/94742
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index d2f3f85..e1f9786 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -3378,6 +3378,9 @@ cp_parser_diagnose_invalid_type_name (cp_parser *parser, tree id,
else if (!flag_concepts && id == ridpointers[(int)RID_CONCEPT])
inform (location, "%<concept%> only available with %<-std=c++2a%> or "
"%<-fconcepts%>");
+ else if (!flag_concepts && id == ridpointers[(int)RID_REQUIRES])
+ inform (location, "%<requires%> only available with %<-std=c++2a%> or "
+ "%<-fconcepts%>");
else if (processing_template_decl && current_class_type
&& TYPE_BINFO (current_class_type))
{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b9be668..efbfe99 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2020-04-25 Patrick Palka <ppalka@redhat.com>
+
+ * g++.dg/concepts/diagnostic11.C: New test.
+
2020-04-25 Jakub Jelinek <jakub@redhat.com>
PR c++/94742
diff --git a/gcc/testsuite/g++.dg/concepts/diagnostic11.C b/gcc/testsuite/g++.dg/concepts/diagnostic11.C
new file mode 100644
index 0000000..7c60912
--- /dev/null
+++ b/gcc/testsuite/g++.dg/concepts/diagnostic11.C
@@ -0,0 +1,6 @@
+// { dg-do compile { target c++17_only } }
+
+template <bool B>
+ requires B // { dg-error ".requires. does not name a type" }
+// { dg-message ".requires. only available with" "" { target *-*-* } .-1 }
+void foo() { }