This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: Really fix PR18596
"Joseph S. Myers" <joseph@codesourcery.com> writes:
> On Sun, 19 Dec 2004, James A. Morrison wrote:
>
> > * c-parse.in (initdcl): Don't call finish decl if start_decl fails.
>
> There are two calls to finish_decl (not "finish decl", please fix all the
> typos in your ChangeLog entries) from initdcl and two from notype_initdcl.
> Why are you only changing one of the four? Have you tested corresponding
> circumstances that would trigger the other three? (Please add such tests
> to the testsuite.)
I didn't think I could trigger the failure in the other case, notype_initdcl
was an oversight since I didn't have that test. Thanks for the quick look.
I've added the other tests now and checking if start_decl fails in the
other 3 cases fixes the segfaults. I've only tested this updated patch with
make and make check RUNTESTFLAGS="gcc.dg/dg.exp" .
--
Thanks,
Jim
http://www.student.cs.uwaterloo.ca/~ja2morri/
http://phython.blogspot.com
http://open.nit.ca/wiki/?page=jim
/* { dg-do compile } */
/* { dg-options "-fno-unit-at-a-time" } */
int f(int i)
{
static int g(); /* { dg-error "invalid storage class" } */
static int g() { return i; } /* { dg-error "invalid storage class" } */
return g();
}
int k (int i)
{
static int g (); /* { dg-error "invalid storage class" } */
int g () {
return i;
}
return g ();
}
int l (int i)
{
auto int g ();
static int g () { /* { dg-error "invalid storage class" } */
return i;
}
static int h () { /* { dg-error "invalid storage class" } */
return 3;
}
return g () + h ();
}
int m (int i)
{
static g (); /* { dg-error "invalid storage class" } */
static g () { return i; } /* { dg-error "invalid storage class" } */
return g ();
}
/* { dg-do compile } */
/* { dg-options "-funit-at-a-time" } */
int f(int i)
{
static int g(); /* { dg-error "invalid storage class" } */
static int g() { return i; } /* { dg-error "invalid storage class" } */
return g();
}
int k (int i)
{
static int g (); /* { dg-error "invalid storage class" } */
int g () {
return i;
}
return g ();
}
int l (int i)
{
auto int g ();
static int g () { /* { dg-error "invalid storage class" } */
return i;
}
static int h () { /* { dg-error "invalid storage class" } */
return 3;
}
return g () + h ();
}
int m (int i)
{
static g (); /* { dg-error "invalid storage class" } */
static g () { return i; } /* { dg-error "invalid storage class" } */
return g ();
}
/* { dg-do compile } */
/* { dg-options "" } */
int foo ()
{
static g () = 0; /* { dg-error "invalid storage class" } */
static int f () = 1; /* { dg-error "invalid storage class" } */
auto int h () = 0; /* { dg-error "initialized like a variable" } */
}
/* { dg-error "(parse|syntax) error" "function declaration" { target *-*-* } 6 } */
/* { dg-error "(parse|syntax) error" "function declaration" { target *-*-* } 7 } */
2004-12-19 James A. Morrison <phython@gcc.gnu.org>
PR c/18596
* c-parse.in (initdcl): Don't process a declaration if start_decl fails.
(notype_initdcl): Don't process a declaration if start_decl fails.
* c-decl.c (start_decl): Fail if grokdeclarator fails.
(grokdeclarator): Fail if a function definition has an invalid storage
class.
testsuite:
PR c/18596
* gcc.dg/funcdec-storage-1.c (foo): Remove.
* gcc.dg/pr18596-1.c: Use dg-error.
(dg-options): Use -fno-unit-at-a-time.
* gcc.dg/pr18596-2.c: New test.
* gcc.dg/pr18596-3.c: New test.
Index: c-parse.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/c-parse.in,v
retrieving revision 1.255
diff -u -p -r1.255 c-parse.in
--- c-parse.in 9 Nov 2004 10:12:14 -0000 1.255
+++ c-parse.in 16 Dec 2004 12:27:43 -0000
@@ -1321,6 +1321,8 @@ initdcl:
declarator maybeasm maybe_attribute '='
{ $<ttype>$ = start_decl ($1, current_declspecs, true,
chainon ($3, all_prefix_attributes));
+ if (!$<ttype>$)
+ YYERROR1;
start_init ($<ttype>$, $2, global_bindings_p ()); }
init
/* Note how the declaration of the variable is in effect while its init is parsed! */
@@ -1330,7 +1330,8 @@ initdcl:
| declarator maybeasm maybe_attribute
{ tree d = start_decl ($1, current_declspecs, false,
chainon ($3, all_prefix_attributes));
- finish_decl (d, NULL_TREE, $2);
+ if (d)
+ finish_decl (d, NULL_TREE, $2);
}
;
@@ -1338,6 +1341,8 @@ notype_initdcl:
notype_declarator maybeasm maybe_attribute '='
{ $<ttype>$ = start_decl ($1, current_declspecs, true,
chainon ($3, all_prefix_attributes));
+ if (!$<ttype>$)
+ YYERROR1;
start_init ($<ttype>$, $2, global_bindings_p ()); }
init
/* Note how the declaration of the variable is in effect while its init is parsed! */
@@ -1347,7 +1348,8 @@ notype_initdcl:
| notype_declarator maybeasm maybe_attribute
{ tree d = start_decl ($1, current_declspecs, false,
chainon ($3, all_prefix_attributes));
- finish_decl (d, NULL_TREE, $2); }
+ if (d)
+ finish_decl (d, NULL_TREE, $2); }
;
/* the * rules are dummies to accept the Apollo extended syntax
so that the header files compile. */
Index: c-decl.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/c-decl.c,v
retrieving revision 1.612
diff -u -p -r1.612 c-decl.c
--- c-decl.c 30 Nov 2004 00:32:23 -0000 1.612
+++ c-decl.c 16 Dec 2004 12:27:46 -0000
@@ -2952,6 +2952,8 @@ start_decl (struct c_declarator *declara
decl = grokdeclarator (declarator, declspecs,
NORMAL, initialized, NULL);
+ if (!decl)
+ return 0;
deprecated_state = DEPRECATED_NORMAL;
@@ -4428,14 +4430,9 @@ grokdeclarator (const struct c_declarato
}
else if (TREE_CODE (type) == FUNCTION_TYPE)
{
- decl = build_decl (FUNCTION_DECL, declarator->u.id, type);
- decl = build_decl_attribute_variant (decl, decl_attr);
-
if (storage_class == csc_register || threadp)
{
error ("invalid storage class for function %qs", name);
- if (DECL_INITIAL (decl) != NULL_TREE)
- DECL_INITIAL (decl) = error_mark_node;
}
else if (current_scope != file_scope)
{
@@ -4449,14 +4446,19 @@ grokdeclarator (const struct c_declarato
if (pedantic)
pedwarn ("invalid storage class for function %qs", name);
}
- if (storage_class == csc_static)
+ else if (storage_class == csc_static)
{
error ("invalid storage class for function %qs", name);
- if (DECL_INITIAL (decl) != NULL_TREE)
- DECL_INITIAL (decl) = error_mark_node;
+ if (funcdef_flag)
+ storage_class = declspecs->storage_class = csc_none;
+ else
+ return 0;
}
}
+ decl = build_decl (FUNCTION_DECL, declarator->u.id, type);
+ decl = build_decl_attribute_variant (decl, decl_attr);
+
DECL_LANG_SPECIFIC (decl) = GGC_CNEW (struct lang_decl);
if (pedantic && type_quals && !DECL_IN_SYSTEM_HEADER (decl))
Index: testsuite/gcc.dg/funcdef-storage-1.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.dg/funcdef-storage-1.c,v
retrieving revision 1.2
diff -u -r1.2 funcdef-storage-1.c
--- testsuite/gcc.dg/funcdef-storage-1.c 1 Sep 2004 01:05:56 -0000 1.2
+++ testsuite/gcc.dg/funcdef-storage-1.c 19 Dec 2004 17:40:20 -0000
@@ -1,5 +1,4 @@
/* { dg-do compile } */
-/* { dg-options "" } */
void
flarm(void)
@@ -8,8 +7,3 @@
foo();
}
-
-static void
-foo(void)
-{
-}