This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: Really fix PR18596


"Joseph S. Myers" <joseph@codesourcery.com> writes:

> On Sun, 19 Dec 2004, James A. Morrison wrote:
> 
> >  start_init and finish_init seem to be ok without a decl.  Unfortunatly
> > really_start_incrementatl_init and other functions called from the init
> > rule don't work well without a decl.
> 
> Perhaps then adjust them to work when the decl is error_mark_node, and 
> pass that in.

 That is it.  That removes the segfault because constructor_decl now has
a type.  The following patch has been bootstrapped and tested on
sparc-linux with no new regressions.  This patches does cause a bit of a
regression in warning messages from gcc 3.x since on
int foo () {
        static int g () =
                { 0, 0, -1, 0.0, 18 };
}
gcc 3.x would give
foo.c:4: warning: excess elements in scalar initializer
foo.c:4: warning: (near initialization for `g')

Now we give
foo.c:4: warning: excess elements in scalar initializer
foo.c:4: warning: (near initialization for '(anonymous)')

 It may be worthwhile removing this warnings altogether, but it isn't
something for this patch.
 
-- 
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" } */
  static int i () = { 0 }; /* { dg-error "invalid storage class" } */
  static int j () = /* { dg-error "invalid storage class" } */
	{ 0, 0.0 };
}
/* { dg-warning "excess elements" "" { target *-*-* } 11 } */
/* { dg-warning "near initialization" "" { target *-*-* } 11 } */
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.
	* c-typeck.c (start_init): Treat error_mark_node the same as 0.

testsuite:
	PR c/18596
	* gcc.dg/funcdef-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-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)
-{
-}
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	20 Dec 2004 03:17:30 -0000
@@ -1321,16 +1321,23 @@ initdcl:
 	  declarator maybeasm maybe_attribute '='
 		{ $<ttype>$ = start_decl ($1, current_declspecs, true,
 					  chainon ($3, all_prefix_attributes));
+		  if (!$<ttype>$)
+		    $<ttype>$ = error_mark_node;
 		  start_init ($<ttype>$, $2, global_bindings_p ()); }
 	  init
 /* Note how the declaration of the variable is in effect while its init is parsed! */
 		{ finish_init ();
-		  maybe_warn_string_init (TREE_TYPE ($<ttype>5), $6);
-		  finish_decl ($<ttype>5, $6.value, $2); }
+		  if ($<ttype>5 != error_mark_node)
+		    {
+		      maybe_warn_string_init (TREE_TYPE ($<ttype>5), $6);
+		      finish_decl ($<ttype>5, $6.value, $2);
+		    }
+		}
 	| 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,16 +1345,23 @@ notype_initdcl:
 	  notype_declarator maybeasm maybe_attribute '='
 		{ $<ttype>$ = start_decl ($1, current_declspecs, true,
 					  chainon ($3, all_prefix_attributes));
+		  if (!$<ttype>$)
+		    $<ttype>$ = error_mark_node;
 		  start_init ($<ttype>$, $2, global_bindings_p ()); }
 	  init
 /* Note how the declaration of the variable is in effect while its init is parsed! */
 		{ finish_init ();
-		  maybe_warn_string_init (TREE_TYPE ($<ttype>5), $6);
-		  finish_decl ($<ttype>5, $6.value, $2); }
+		  if ($<ttype>5 != error_mark_node)
+		    {
+		      maybe_warn_string_init (TREE_TYPE ($<ttype>5), $6);
+		      finish_decl ($<ttype>5, $6.value, $2);
+		    }
+		}
 	| 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-typeck.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/c-typeck.c,v
retrieving revision 1.404
diff -u -p -r1.404 c-typeck.c
--- c-typeck.c	10 Dec 2004 21:08:19 -0000	1.404
+++ c-typeck.c	20 Dec 2004 03:17:32 -0000
@@ -4470,7 +4470,7 @@ start_init (tree decl, tree asmspec_tree
   constructor_designated = 0;
   constructor_top_level = top_level;
 
-  if (decl != 0)
+  if (decl != 0 && decl != error_mark_node)
     {
       require_constant_value = TREE_STATIC (decl);
       require_constant_elements

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]