This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Patch for PR c/14050
- From: "Joseph S. Myers" <joseph at codesourcery dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Thu, 22 Nov 2007 23:13:10 +0000 (UTC)
- Subject: Patch for PR c/14050
Now C99 TC3 has been published, I've applied this patch to fix PR
14050 by implementing the resolution to DR#289.
Bootstrapped with no regressions on i686-pc-linux-gnu.
2007-11-22 Joseph Myers <joseph@codesourcery.com>
PR c/14050
* c-decl.c (set_array_declarator_inner): Don't give error for
static or type qualifiers in abstract declarator. Remove
abstract_p parameter.
* c-tree.h (set_array_declarator_inner): Update prototype.
* c-parser.c (c_parser_direct_declarator_inner): Update call to
set_array_declarator_inner.
* doc/standards.texi: Update for C99 TC3.
testsuite:
2007-11-22 Joseph Myers <joseph@codesourcery.com>
PR c/14050
* gcc.dg/c99-arraydecl-1.c: Don't expect errors for static or type
qualifiers in abstract declarator.
Index: doc/standards.texi
===================================================================
--- doc/standards.texi (revision 130353)
+++ doc/standards.texi (working copy)
@@ -37,6 +37,8 @@
@cindex Technical Corrigendum 1
@cindex TC2
@cindex Technical Corrigendum 2
+@cindex TC3
+@cindex Technical Corrigendum 3
@cindex AMD1
@cindex freestanding implementation
@cindex freestanding environment
@@ -86,9 +88,9 @@
development, drafts of this standard version were referred to as
@dfn{C9X}.)
-Errors in the 1999 ISO C standard were corrected in two Technical
-Corrigenda published in 2001 and 2004. GCC does not support the uncorrected
-version.
+Errors in the 1999 ISO C standard were corrected in three Technical
+Corrigenda published in 2001, 2004 and 2007. GCC does not support the
+uncorrected version.
By default, GCC provides some extensions to the C language that on
rare occasions conflict with the C standard. @xref{C
Index: testsuite/gcc.dg/c99-arraydecl-1.c
===================================================================
--- testsuite/gcc.dg/c99-arraydecl-1.c (revision 130353)
+++ testsuite/gcc.dg/c99-arraydecl-1.c (working copy)
@@ -9,8 +9,8 @@
[quals static expr]. Not yet: [quals *]. */
void f00 (int a[const]);
-void f01 (int [const]); /* { dg-bogus "warning" "warning in place of error" } */
-/* { dg-error "abstract" "\[quals\] in abstract declarator" { target *-*-* } 12 } */
+void f01 (int [const]);
+
void
f02 (int a[const])
{
@@ -28,8 +28,8 @@
}
void f10 (int a[const 2]);
-void f11 (int [const 2]); /* { dg-bogus "warning" "warning in place of error" } */
-/* { dg-error "abstract" "\[quals expr\] in abstract declarator" { target *-*-* } 31 } */
+void f11 (int [const 2]);
+
void
f12 (int a[const 2])
{
@@ -47,8 +47,8 @@
}
void f20 (int a[static 2]);
-void f21 (int [static 2]); /* { dg-bogus "warning" "warning in place of error" } */
-/* { dg-error "abstract" "\[static expr\] in abstract declarator" { target *-*-* } 50 } */
+void f21 (int [static 2]);
+
void
f22 (int a[static 2])
{
@@ -64,8 +64,8 @@
}
void f30 (int a[static const 2]);
-void f31 (int [static const 2]); /* { dg-bogus "warning" "warning in place of error" } */
-/* { dg-error "abstract" "\[static quals expr\] in abstract declarator" { target *-*-* } 67 } */
+void f31 (int [static const 2]);
+
void
f32 (int a[static const 2])
{
@@ -83,8 +83,8 @@
}
void f40 (int a[const static 2]);
-void f41 (int [const static 2]); /* { dg-bogus "warning" "warning in place of error" } */
-/* { dg-error "abstract" "\[quals static expr\] in abstract declarator" { target *-*-* } 86 } */
+void f41 (int [const static 2]);
+
void
f42 (int a[const static 2])
{
Index: c-tree.h
===================================================================
--- c-tree.h (revision 130353)
+++ c-tree.h (working copy)
@@ -487,8 +487,7 @@
extern void c_pop_function_context (struct function *);
extern void push_parm_decl (const struct c_parm *);
extern struct c_declarator *set_array_declarator_inner (struct c_declarator *,
- struct c_declarator *,
- bool);
+ struct c_declarator *);
extern tree c_builtin_function (tree);
extern void shadow_tag (const struct c_declspecs *);
extern void shadow_tag_warned (const struct c_declspecs *, int);
Index: c-decl.c
===================================================================
--- c-decl.c (revision 130353)
+++ c-decl.c (working copy)
@@ -3081,20 +3081,13 @@
/* Set the contained declarator of an array declarator. DECL is the
declarator, as constructed by build_array_declarator; INNER is what
- appears on the left of the []. ABSTRACT_P is true if it is an
- abstract declarator, false otherwise; this is used to reject static
- and type qualifiers in abstract declarators, where they are not in
- the C99 grammar (subject to possible change in DR#289). */
+ appears on the left of the []. */
struct c_declarator *
set_array_declarator_inner (struct c_declarator *decl,
- struct c_declarator *inner, bool abstract_p)
+ struct c_declarator *inner)
{
decl->declarator = inner;
- if (abstract_p && (decl->u.array.quals != TYPE_UNQUALIFIED
- || decl->u.array.attrs != NULL_TREE
- || decl->u.array.static_p))
- error ("static or type qualifiers in abstract declarator");
return decl;
}
Index: c-parser.c
===================================================================
--- c-parser.c (revision 130353)
+++ c-parser.c (working copy)
@@ -2499,7 +2499,7 @@
star_seen);
if (declarator == NULL)
return NULL;
- inner = set_array_declarator_inner (declarator, inner, !id_present);
+ inner = set_array_declarator_inner (declarator, inner);
return c_parser_direct_declarator_inner (parser, id_present, inner);
}
else if (c_parser_next_token_is (parser, CPP_OPEN_PAREN))
--
Joseph S. Myers
joseph@codesourcery.com