* c-common.c (handle_unused_attribute): Use VAR_OR_FUNCTION_DECL_P.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@224996 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 619bca6..fc88354 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,7 @@
+2015-06-26  Marek Polacek  <polacek@redhat.com>
+
+       * c-common.c (handle_unused_attribute): Use VAR_OR_FUNCTION_DECL_P.
+
 2015-06-25  Andrew MacLeod  <amacleod@redhat.com>
 
        * c-common.c: Remove ipa-ref.h and plugin-api.h from include list.

diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index 73d0c7f..b11a756 100644 (file)
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -7376,8 +7376,7 @@ handle_unused_attribute (tree *node, tree name, tree ARG_UNUSED (args),
       tree decl = *node;
 
       if (TREE_CODE (decl) == PARM_DECL
-         || VAR_P (decl)
-         || TREE_CODE (decl) == FUNCTION_DECL
+         || VAR_OR_FUNCTION_DECL_P (decl)
          || TREE_CODE (decl) == LABEL_DECL
          || TREE_CODE (decl) == TYPE_DECL)
        {