re PR c++/89640 (g++ chokes on lambda with __attribute__)

	PR c++/89640
	* parser.c (cp_parser_decl_specifier_seq): Don't parse attributes
	if CP_PARSER_FLAGS_ONLY_MUTABLE_OR_CONSTEXPR.

	* g++.dg/cpp1z/attr-lambda1.C: New test.
	* g++.dg/ext/attr-lambda2.C: New test.

From-SVN: r277741

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 06a4e31578f8cc4bfd661021df2bed3b829b8181..54ed775c2e94595006d484e238723db29f26bdcc 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2019-11-02  Jakub Jelinek  <jakub@redhat.com>
 
+       PR c++/89640
+       * parser.c (cp_parser_decl_specifier_seq): Don't parse attributes
+       if CP_PARSER_FLAGS_ONLY_MUTABLE_OR_CONSTEXPR.
+
        PR c++/88335 - Implement P1073R3: Immediate functions
        * cp-tree.h (struct lang_decl_fn): Add immediate_fn_p bit.
        (DECL_IMMEDIATE_FUNCTION_P, SET_DECL_IMMEDIATE_FUNCTION_P): Define.

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 516c14b5610decd7b9c27d73ebc1a885a0c4f519..3ed282fd4b2f9ee4c7c1fef9226d155f68cd18be 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -13994,7 +13994,8 @@ cp_parser_decl_specifier_seq (cp_parser* parser,
       if (!start_token)
        start_token = token;
       /* Handle attributes.  */
-      if (cp_next_tokens_can_be_attribute_p (parser))
+      if ((flags & CP_PARSER_FLAGS_ONLY_MUTABLE_OR_CONSTEXPR) == 0
+         && cp_next_tokens_can_be_attribute_p (parser))
        {
          /* Parse the attributes.  */
          tree attrs = cp_parser_attributes_opt (parser);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e8a3856afebd588a1855caf03b0330fc21d21e32..ea52930076102c1681dab8a0f624f097eadd2527 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2019-11-02  Jakub Jelinek  <jakub@redhat.com>
 
+       PR c++/89640
+       * g++.dg/cpp1z/attr-lambda1.C: New test.
+       * g++.dg/ext/attr-lambda2.C: New test.
+
        * c-c++-common/gomp/declare-variant-6.c: Expect construct rather than
        constructor in diagnostic messages.
        * c-c++-common/gomp/declare-variant-7.c: Likewise.

diff --git a/gcc/testsuite/g++.dg/cpp1z/attr-lambda1.C b/gcc/testsuite/g++.dg/cpp1z/attr-lambda1.C
new file mode 100644 (file)
index 0000000..f223472
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1z/attr-lambda1.C
@@ -0,0 +1,12 @@
+// PR c++/89640
+// { dg-options "-Wno-attributes" }
+// { dg-do compile { target c++17 } }
+
+void test() {
+    []() mutable [[gnu::cold]] constexpr {}();         // { dg-error "expected" }
+    []() constexpr [[gnu::cold]] mutable {}();         // { dg-error "expected" }
+    []() [[gnu::cold]] mutable constexpr {}();         // { dg-error "expected" }
+    []() [[gnu::cold]] constexpr mutable {}();         // { dg-error "expected" }
+    []() mutable constexpr [[gnu::cold]] {}();
+    []() constexpr mutable [[gnu::cold]] {}();
+}

diff --git a/gcc/testsuite/g++.dg/ext/attr-lambda2.C b/gcc/testsuite/g++.dg/ext/attr-lambda2.C
new file mode 100644 (file)
index 0000000..2926adc
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/attr-lambda2.C
@@ -0,0 +1,12 @@
+// PR c++/89640
+// { dg-options "-Wno-attributes" }
+// { dg-do compile { target c++17 } }
+
+void test() {
+    []() mutable __attribute__((cold)) constexpr {}(); // { dg-error "expected" }
+    []() constexpr __attribute__((cold)) mutable {}(); // { dg-error "expected" }
+    []() __attribute__((cold)) mutable constexpr {}(); // { dg-error "expected" }
+    []() __attribute__((cold)) constexpr mutable {}(); // { dg-error "expected" }
+    []() mutable constexpr __attribute__((cold)) {}();
+    []() constexpr mutable __attribute__((cold)) {}();
+}