diff options
| -rw-r--r-- | gcc/ada/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/utils.c | 15 | ||||
| -rw-r--r-- | gcc/c-family/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/c-family/c-common.c | 15 | ||||
| -rw-r--r-- | gcc/lto/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/lto/lto-lang.c | 16 |
6 files changed, 22 insertions, 40 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 033c211..155256e 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2011-04-08 Nathan Froyd <froydnj@codesourcery.com> + + * gcc-interface/utils.c (handle_sentinel_attribute): Don't use + TYPE_ARG_TYPES + (handle_type_generic_attribute): Likewise. + 2011-04-04 Eric Botcazou <ebotcazou@adacore.com> PR ada/47163 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; } diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index b859db6..af66eda 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,8 @@ +2011-04-08 Nathan Froyd <froydnj@codesourcery.com> + + * c-common.c (handle_sentinel_attribute): Don't use TYPE_ARG_TYPES. + (handle_type_generic_attribute): Likewise. + 2011-04-07 Jason Merrill <jason@redhat.com> PR c++/48450 diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c index e0acfea..63444b8 100644 --- a/gcc/c-family/c-common.c +++ b/gcc/c-family/c-common.c @@ -7662,8 +7662,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, @@ -7672,10 +7670,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, "%qE attribute only applies to variadic functions", name); @@ -7714,17 +7709,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; } diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog index 00f695f..56bf3f5b 100644 --- a/gcc/lto/ChangeLog +++ b/gcc/lto/ChangeLog @@ -1,3 +1,8 @@ +2011-04-08 Nathan Froyd <froydnj@codesourcery.com> + + * lto-lang.c (handle_sentinel_attribute): Don't use TYPE_ARG_TYPES. + (handle_type_generic_attribute): Likewise. + 2011-04-03 Michael Matz <matz@suse.de> * lto.c (lto_materialize_function): Don't read and then discard diff --git a/gcc/lto/lto-lang.c b/gcc/lto/lto-lang.c index 535fc58..c65d916 100644 --- a/gcc/lto/lto-lang.c +++ b/gcc/lto/lto-lang.c @@ -373,13 +373,7 @@ handle_sentinel_attribute (tree *node, tree ARG_UNUSED (name), tree args, int ARG_UNUSED (flags), bool * ARG_UNUSED (no_add_attrs)) { - tree params = TYPE_ARG_TYPES (*node); - gcc_assert (params); - - while (TREE_CHAIN (params)) - params = TREE_CHAIN (params); - - gcc_assert (!VOID_TYPE_P (TREE_VALUE (params))); + gcc_assert (stdarg_p (*node)); if (args) { @@ -399,17 +393,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; } |