aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMarek Polacek <polacek@redhat.com>2020-04-23 14:38:58 -0400
committerMarek Polacek <polacek@redhat.com>2020-04-23 15:13:55 -0400
commit7291b2edf6f87fba839b0d10c04b2562a5f6bd60 (patch)
treeff03733a96219eb6a43a0b985de63cdaf14a9fbe /gcc
parentbca558de2a24b2a78c6a321d6cec384e07759d77 (diff)
downloadgcc-7291b2edf6f87fba839b0d10c04b2562a5f6bd60.zip
gcc-7291b2edf6f87fba839b0d10c04b2562a5f6bd60.tar.gz
gcc-7291b2edf6f87fba839b0d10c04b2562a5f6bd60.tar.bz2
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.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/c-family/ChangeLog6
-rw-r--r--gcc/c-family/c-attribs.c2
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/tm/attrib-5.C5
4 files changed, 17 insertions, 1 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 66f4873..55e6eb8 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 1483b35..ac936d5 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 c6ae489..b287e12 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 0000000..0b7bc72
--- /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 { };