From dcf0c47e8ddf338b9d3f02f9bee3265c1b4138d1 Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Fri, 8 Apr 2011 17:05:23 +0000 Subject: utils.c (handle_sentinel_attribute): Don't use TYPE_ARG_TYPES gcc/ada/ * gcc-interface/utils.c (handle_sentinel_attribute): Don't use TYPE_ARG_TYPES (handle_type_generic_attribute): Likewise. gcc/c-family/ * c-common.c (handle_sentinel_attribute): Don't use TYPE_ARG_TYPES. (handle_type_generic_attribute): Likewise. gcc/lto/ * lto-lang.c (handle_sentinel_attribute): Don't use TYPE_ARG_TYPES. (handle_type_generic_attribute): Likewise. From-SVN: r172200 --- gcc/ada/gcc-interface/utils.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'gcc/ada/gcc-interface/utils.c') diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c index dc74374..8a78789 100644 --- a/gcc/ada/gcc-interface/utils.c +++ b/gcc/ada/gcc-interface/utils.c @@ -5266,8 +5266,6 @@ static tree handle_sentinel_attribute (tree *node, tree name, tree args, int ARG_UNUSED (flags), bool *no_add_attrs) { - tree params = TYPE_ARG_TYPES (*node); - if (!prototype_p (*node)) { warning (OPT_Wattributes, @@ -5277,10 +5275,7 @@ handle_sentinel_attribute (tree *node, tree name, tree args, } else { - while (TREE_CHAIN (params)) - params = TREE_CHAIN (params); - - if (VOID_TYPE_P (TREE_VALUE (params))) + if (!stdarg_p (*node)) { warning (OPT_Wattributes, "%qs attribute only applies to variadic functions", @@ -5400,17 +5395,11 @@ handle_type_generic_attribute (tree *node, tree ARG_UNUSED (name), tree ARG_UNUSED (args), int ARG_UNUSED (flags), bool * ARG_UNUSED (no_add_attrs)) { - tree params; - /* Ensure we have a function type. */ gcc_assert (TREE_CODE (*node) == FUNCTION_TYPE); - params = TYPE_ARG_TYPES (*node); - while (params && ! VOID_TYPE_P (TREE_VALUE (params))) - params = TREE_CHAIN (params); - /* Ensure we have a variadic function. */ - gcc_assert (!params); + gcc_assert (!prototype_p (*node) || stdarg_p (*node)); return NULL_TREE; } -- cgit v1.1