aboutsummaryrefslogtreecommitdiff
path: root/gcc/c-family
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2013-02-05 09:08:27 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2013-02-05 09:08:27 +0100
commitcf35e2b1e6e24e73f727deda55d6f4042a8ef23d (patch)
tree17b1dbf0df701a78d2dbc1bf31b6098d2a74a1ec /gcc/c-family
parentea99f6314dfb7dafa574c27bbee9f4fdef235129 (diff)
downloadgcc-cf35e2b1e6e24e73f727deda55d6f4042a8ef23d.zip
gcc-cf35e2b1e6e24e73f727deda55d6f4042a8ef23d.tar.gz
gcc-cf35e2b1e6e24e73f727deda55d6f4042a8ef23d.tar.bz2
re PR middle-end/56167 (ICE with invalid __attribute__ arguments)
PR middle-end/56167 * c-common.c (handle_error_attribute): Fix condition. * gcc.dg/pr56167.c: New test. From-SVN: r195748
Diffstat (limited to 'gcc/c-family')
-rw-r--r--gcc/c-family/ChangeLog5
-rw-r--r--gcc/c-family/c-common.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 2fbc8f4..16ef84a 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-05 Jakub Jelinek <jakub@redhat.com>
+
+ PR middle-end/56167
+ * c-common.c (handle_error_attribute): Fix condition.
+
2013-01-30 Jakub Jelinek <jakub@redhat.com>
PR c++/55742
diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index b3699dc..1e6afaa 100644
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -6678,7 +6678,7 @@ handle_error_attribute (tree *node, tree name, tree args,
int ARG_UNUSED (flags), bool *no_add_attrs)
{
if (TREE_CODE (*node) == FUNCTION_DECL
- || TREE_CODE (TREE_VALUE (args)) == STRING_CST)
+ && TREE_CODE (TREE_VALUE (args)) == STRING_CST)
/* Do nothing else, just set the attribute. We'll get at
it later with lookup_attribute. */
;