re PR c/35445 (ICE with conflicting declarations)

gcc/

2011-05-02  Simon Martin  <simartin@users.sourceforge.net>

    PR c/35445
    * c-decl.c (finish_decl): Only create a composite if the types are
    compatible.

gcc/testsuite/

2011-05-02  Simon Martin  <simartin@users.sourceforge.net>

    PR c/35445
    * gcc.dg/pr35445.c: New test.

From-SVN: r173269

gcc/ChangeLog

+2011-05-02  Simon Martin  <simartin@users.sourceforge.net>
+
+	PR c/35445
+	* c-decl.c (finish_decl): Only create a composite if the types are
+	compatible.
+
 2011-05-02  Joseph Myers  <joseph@codesourcery.com>
 
 	* config/fr30/fr30-protos.h (Mmode): Don't define.

gcc/c-decl.c

@@ -4246,7 +4246,7 @@ finish_decl (tree decl, location_t init_loc, tree init,
 		b_ext = b_ext->shadowed;
 	      if (b_ext)
 		{
-		  if (b_ext->u.type)
+		  if (b_ext->u.type && comptypes (b_ext->u.type, type))
 		    b_ext->u.type = composite_type (b_ext->u.type, type);
 		  else
 		    b_ext->u.type = type;

gcc/testsuite/ChangeLog

+2011-05-02  Simon Martin  <simartin@users.sourceforge.net>
+
+	PR c/35445
+	* gcc.dg/pr35445.c: New test.
+
 2011-05-02  Jason Merrill  <jason@redhat.com>
 
 	* c-c++-common/vla-1.c: New.

gcc/testsuite/gcc.dg/pr35445.c

+/* PR c/35445 */
+/* { dg-do "compile" } */
+
+extern int i;
+extern int i; /* { dg-message "was here" } */
+int i[] = { 0 }; /* { dg-error "conflicting types" } */