c-parse.in (parmlist_or_identifiers): Add maybe_attribute.

2002-01-16  Aldy Hernandez  <aldyh@redhat.com>

        * c-parse.in (parmlist_or_identifiers): Add maybe_attribute.
        (parmlist_or_identifiers_1): Verify that only a parmlist follows
        an attribute.

        * gcc.dg/20020115-1.c: New.

From-SVN: r49161

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c411ccc..b0aeeae 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-23  Aldy Hernandez  <aldyh@redhat.com>
+
+        * c-parse.in (parmlist_or_identifiers): Add maybe_attribute.
+        (parmlist_or_identifiers_1): Verify that only a parmlist follows
+        an attribute.
+
 2002-01-23  Richard Henderson  <rth@redhat.com>
 
        * expr.c (move_by_pieces_1): Extend size before negation.

diff --git a/gcc/c-parse.in b/gcc/c-parse.in
index 9434a2f..524d407 100644 (file)
--- a/gcc/c-parse.in
+++ b/gcc/c-parse.in
@@ -2605,11 +2605,12 @@ setspecs_fp:
    where either a parmlist or an identifier list is ok.
    Its value is a list of ..._TYPE nodes or a list of identifiers.  */
 parmlist_or_identifiers:
+         maybe_attribute
                { pushlevel (0);
                  clear_parm_order ();
                  declare_parm_level (1); }
          parmlist_or_identifiers_1
-               { $$ = $2;
+               { $$ = $3;
                  parmlist_tags_warning ();
                  poplevel (0, 0, 0); }
        ;
@@ -2621,7 +2622,15 @@ parmlist_or_identifiers_1:
                  for (t = $1; t; t = TREE_CHAIN (t))
                    if (TREE_VALUE (t) == NULL_TREE)
                      error ("`...' in old-style identifier list");
-                 $$ = tree_cons (NULL_TREE, NULL_TREE, $1); }
+                 $$ = tree_cons (NULL_TREE, NULL_TREE, $1);
+
+                 /* Make sure we have a parmlist after attributes.  */
+                 if ($<ttype>-1 != 0
+                     && (TREE_CODE ($$) != TREE_LIST
+                         || TREE_PURPOSE ($$) == 0
+                         || TREE_CODE (TREE_PURPOSE ($$)) != PARM_DECL))
+                   YYERROR1;
+               }
        ;
 
 /* A nonempty list of identifiers.  */

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index eb918c3..dafeb90 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-23  Aldy Hernandez  <aldyh@redhat.com>
+
+        * gcc.dg/20020115-1.c: New.
+
 2002-01-23  Bob Wilson  <bob.wilson@acm.org>
 
        * gcc.c-torture/compile/20001226-1.x: xfail for Xtensa.

diff --git a/gcc/testsuite/gcc.dg/20020115-1.c b/gcc/testsuite/gcc.dg/20020115-1.c
new file mode 100644 (file)
index 0000000..9d4ea54
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/20020115-1.c
@@ -0,0 +1,15 @@
+/* { dg-do compile } */
+
+/* Test attributes in function arguments.  */
+/* Origin: Aldy Hernandez <aldyh@redhat.com>.  */
+
+#define blah __attribute__((__mode__(QI)))
+
+extern void bar(int *);
+
+void foo (blah int abc)
+{
+
+       int b[sizeof(abc) == 1 ? 1 : -1];
+       bar (b);
+}