From: Marek Polacek <polacek@redhat.com>
Date: Fri, 23 Aug 2019 00:06:25 +0000 (+0000)
Subject: PR c++/91304 - prefix attributes ignored in condition.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ab3dd132a12c33815912a236c961a5c0d40d1818;p=gcc.git

PR c++/91304 - prefix attributes ignored in condition.

	* parser.c (cp_parser_condition): Handle prefix attributes.

	* g++.dg/cpp0x/gen-attrs-70.C: New test.

From-SVN: r274839
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d47c2f74f37..d2b96231fd0 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2019-08-22  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/91304 - prefix attributes ignored in condition.
+	* parser.c (cp_parser_condition): Handle prefix attributes.
+
 2019-08-21  Richard Sandiford  <richard.sandiford@arm.com>
 
 	PR c++/91505
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index dbbfe1dbc2f..b410a6c030f 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -12066,6 +12066,10 @@ cp_parser_condition (cp_parser* parser)
   /* Restore the saved message.  */
   parser->type_definition_forbidden_message = saved_message;
 
+  /* Gather the attributes that were provided with the
+     decl-specifiers.  */
+  tree prefix_attributes = type_specifiers.attributes;
+
   cp_parser_maybe_commit_to_declaration (parser,
 					 type_specifiers.any_specifiers_p);
 
@@ -12116,7 +12120,7 @@ cp_parser_condition (cp_parser* parser)
 	  /* Create the declaration.  */
 	  decl = start_decl (declarator, &type_specifiers,
 			     /*initialized_p=*/true,
-			     attributes, /*prefix_attributes=*/NULL_TREE,
+			     attributes, prefix_attributes,
 			     &pushed_scope);
 
 	  /* Parse the initializer.  */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a7c4ec33d41..ad5aa69ebda 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-08-22  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/91304 - prefix attributes ignored in condition.
+	* g++.dg/cpp0x/gen-attrs-70.C: New test.
+
 2019-08-22  Martin Sebor  <msebor@redhat.com>
 
 	PR middle-end/91490
diff --git a/gcc/testsuite/g++.dg/cpp0x/gen-attrs-70.C b/gcc/testsuite/g++.dg/cpp0x/gen-attrs-70.C
new file mode 100644
index 00000000000..90a2e97a3f6
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/gen-attrs-70.C
@@ -0,0 +1,13 @@
+// PR c++/91304 - prefix attributes ignored in condition.
+// { dg-do compile { target c++11 } }
+// { dg-additional-options "-Wall -Wextra" }
+
+int f();
+
+void g()
+{   
+  if ([[maybe_unused]] int i = f()) { }
+  if ([[deprecated]] int i = f()) { i = 10; } // { dg-warning ".i. is deprecated" }
+  if (int i [[maybe_unused]] = f()) { }
+  if (int i [[deprecated]] = f()) { i = 10; } // { dg-warning ".i. is deprecated" }
+}