From fad7652e6e9077252612963bc5a0e35015df3753 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 29 Nov 2013 08:42:23 +0100 Subject: [PATCH] re PR c/59280 (ICE with attribute((constructor(invalid)))) PR c/59280 * c-common.c (get_priority): If TREE_VALUE (args) is IDENTIFIER_NODE, goto invalid. If it is error_mark_node, don't issue further diagnostics. testsuite/ * c-c++-common/pr59280.c: New test. From-SVN: r205510 --- gcc/c-family/ChangeLog | 7 +++++++ gcc/c-family/c-common.c | 4 ++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/c-c++-common/pr59280.c | 4 ++++ 4 files changed, 20 insertions(+) create mode 100644 gcc/testsuite/c-c++-common/pr59280.c diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index f4e09381e72..12db5210aaf 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,10 @@ +2013-11-29 Jakub Jelinek + + PR c/59280 + * c-common.c (get_priority): If TREE_VALUE (args) is IDENTIFIER_NODE, + goto invalid. If it is error_mark_node, don't issue further + diagnostics. + 2013-11-28 Sergey Ostanevich * c.opt (Wopenmp-simd): New. diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c index 60b069cdb69..0cf22ca1f5d 100644 --- a/gcc/c-family/c-common.c +++ b/gcc/c-family/c-common.c @@ -7014,6 +7014,10 @@ get_priority (tree args, bool is_destructor) } arg = TREE_VALUE (args); + if (TREE_CODE (arg) == IDENTIFIER_NODE) + goto invalid; + if (arg == error_mark_node) + return DEFAULT_INIT_PRIORITY; arg = default_conversion (arg); if (!tree_fits_shwi_p (arg) || !INTEGRAL_TYPE_P (TREE_TYPE (arg))) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 56acc0e322b..82916752314 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-11-29 Jakub Jelinek + + PR c/59280 + * c-c++-common/pr59280.c: New test. + 2013-11-29 Zhenqiang Chen * gcc.target/arm/lp1243022.c: Skip target arm-neon. diff --git a/gcc/testsuite/c-c++-common/pr59280.c b/gcc/testsuite/c-c++-common/pr59280.c new file mode 100644 index 00000000000..779f0fb858f --- /dev/null +++ b/gcc/testsuite/c-c++-common/pr59280.c @@ -0,0 +1,4 @@ +/* PR c/59280 */ +/* { dg-do compile } */ + +void bar (char *) __attribute__((constructor(foo))); /* { dg-error "constructor priorities must be integers|was not declared|constructor priorities are not supported" } */ -- 2.30.2