From 580b3958265f6bca27126b24f20d95c32d00c854 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Mon, 16 Aug 2004 21:35:21 +0100 Subject: [PATCH] c-decl.c (grokdeclarator): Allow for function definition where innermost declarator has attributes. * c-decl.c (grokdeclarator): Allow for function definition where innermost declarator has attributes. testsuite: * gcc.dg/funcdef-attr-1.c: New test. From-SVN: r86075 --- gcc/ChangeLog | 5 +++++ gcc/c-decl.c | 15 ++++++++++----- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gcc.dg/funcdef-attr-1.c | 14 ++++++++++++++ 4 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/funcdef-attr-1.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 85d5500d36b..991177702ab 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2004-08-16 Joseph S. Myers + + * c-decl.c (grokdeclarator): Allow for function definition where + innermost declarator has attributes. + 2004-08-16 Fariborz Jahanian * except.c (get_exception_filter, build_post_landing_pads, diff --git a/gcc/c-decl.c b/gcc/c-decl.c index c7ba8d20268..e867ebb6c72 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -4176,12 +4176,17 @@ grokdeclarator (tree declarator, tree declspecs, } else if (TREE_CODE (declarator) == CALL_EXPR) { - /* Say it's a definition only for the CALL_EXPR closest to - the identifier. */ - bool really_funcdef = (funcdef_flag - && (TREE_CODE (TREE_OPERAND (declarator, 0)) - == IDENTIFIER_NODE)); + /* Say it's a definition only for the declarator closest to + the identifier, apart possibly from some attributes. */ + bool really_funcdef = false; tree arg_types; + if (funcdef_flag) + { + tree t = TREE_OPERAND (declarator, 0); + while (TREE_CODE (t) == TREE_LIST) + t = TREE_VALUE (t); + really_funcdef = (TREE_CODE (t) == IDENTIFIER_NODE); + } /* Declaring a function type. Make sure we have a valid type for the function to return. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b7d51b16f37..80561d3ad0d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2004-08-16 Joseph S. Myers + + * gcc.dg/funcdef-attr-1.c: New test. + 2004-08-16 Janis Johnson * gcc.dg/altivec-17.c: New test. diff --git a/gcc/testsuite/gcc.dg/funcdef-attr-1.c b/gcc/testsuite/gcc.dg/funcdef-attr-1.c new file mode 100644 index 00000000000..17249a0cb9e --- /dev/null +++ b/gcc/testsuite/gcc.dg/funcdef-attr-1.c @@ -0,0 +1,14 @@ +/* The declarator in a function definition should be able to take the + form of an attributed function declarator, not just a plain + function declarator. This was formerly allowed by some of the code + but then the wrong constraint checks were made because other code + didn't recognise the declarator as being that of the function + definition. */ +/* Origin: Joseph Myers . */ + +int (__attribute__((const)) x) (a, b) + int a; + int b; +{ + return a + b; +} -- 2.30.2