diff options
| -rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/ada/utils.c | 13 |
2 files changed, 16 insertions, 2 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index b752aef..4ba53ac 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2008-05-23 Eric Botcazou <ebotcazou@adacore.com> + + * utils.c (handle_type_generic_attribute): Adjust to accept + fixed arguments before an elipsis. + 2008-05-21 Thomas Quinot <quinot@adacore.com> * g-sothco.ads, g-sothco.adb: New files. diff --git a/gcc/ada/utils.c b/gcc/ada/utils.c index b4b3894..7a984b2 100644 --- a/gcc/ada/utils.c +++ b/gcc/ada/utils.c @@ -4712,8 +4712,17 @@ handle_type_generic_attribute (tree *node, tree ARG_UNUSED (name), tree ARG_UNUSED (args), int ARG_UNUSED (flags), bool * ARG_UNUSED (no_add_attrs)) { - /* Ensure we have a function type, with no arguments. */ - gcc_assert (TREE_CODE (*node) == FUNCTION_TYPE && ! TYPE_ARG_TYPES (*node)); + 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); return NULL_TREE; } |