From: Marek Polacek <polacek@redhat.com>
Date: Thu, 23 Apr 2020 18:38:58 +0000 (-0400)
Subject: c-family: Fix ICE on attribute with -fgnu-tm [PR94733]
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7291b2edf6f87fba839b0d10c04b2562a5f6bd60;p=gcc.git

c-family: Fix ICE on attribute with -fgnu-tm [PR94733]

find_tm_attribute was using TREE_PURPOSE to get the attribute name,
which is breaking now that we preserve the C++11-style attribute
format past decl_attributes.  So use get_attribute_name which can
handle both formats of attributes.

	PR c++/94733
	* c-attribs.c (find_tm_attribute): Use get_attribute_name instead of
	TREE_PURPOSE.

	* g++.dg/tm/attrib-5.C: New test.
---

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 66f4873c3c2..55e6eb8ae45 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,9 @@
+2020-04-23  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/94733
+	* c-attribs.c (find_tm_attribute): Use get_attribute_name instead of
+	TREE_PURPOSE.
+
 2020-04-14  Patrick Palka  <ppalka@redhat.com>
 
 	PR c++/85278
diff --git a/gcc/c-family/c-attribs.c b/gcc/c-family/c-attribs.c
index 1483b3540dc..ac936d5bbbb 100644
--- a/gcc/c-family/c-attribs.c
+++ b/gcc/c-family/c-attribs.c
@@ -3314,7 +3314,7 @@ find_tm_attribute (tree list)
 {
   for (; list ; list = TREE_CHAIN (list))
     {
-      tree name = TREE_PURPOSE (list);
+      tree name = get_attribute_name (list);
       if (tm_attr_to_mask (name) != 0)
 	return name;
     }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c6ae489c43d..b287e12588f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-04-23  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/94733
+	* g++.dg/tm/attrib-5.C: New test.
+
 2020-04-23  Jakub Jelinek  <jakub@redhat.com>
 
 	PR middle-end/94724
diff --git a/gcc/testsuite/g++.dg/tm/attrib-5.C b/gcc/testsuite/g++.dg/tm/attrib-5.C
new file mode 100644
index 00000000000..0b7bc728f06
--- /dev/null
+++ b/gcc/testsuite/g++.dg/tm/attrib-5.C
@@ -0,0 +1,5 @@
+// PR c++/94733
+// { dg-do compile { target c++11 } }
+// { dg-options "-fgnu-tm" }
+
+struct [[gnu::may_alias]] pe { };