From: Jakub Jelinek <jakub@redhat.com>
Date: Thu, 29 Sep 2005 21:34:33 +0000 (+0200)
Subject: re PR middle-end/24109 (non unit-at-a-time failure with compound literals)
X-Git-Tag: misc/cutover-cvs2svn~407
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df4b9cfe50b434e67e4d47f7725aa8e37f778e50;p=thirdparty%2Fgcc.git

re PR middle-end/24109 (non unit-at-a-time failure with compound literals)

	PR middle-end/24109
	* c-decl.c (c_write_global_declarations_1): If any
	wrapup_global_declaration_2 call returned true, restart the loop.

	* gcc.c-torture/execute/20050929-1.c: New test.

From-SVN: r104794
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2242dcdf8cd1..799488a696bc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-29  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/24109
+	* c-decl.c (c_write_global_declarations_1): If any
+	wrapup_global_declaration_2 call returned true, restart the loop.
+
 2005-09-29  Daniel Berlin  <dberlin@dberlin.org>
 	
 	Fix PR tree-optimization/24117
diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index 49c8904fc04b..9c2e829b0c9f 100644
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -7548,6 +7548,7 @@ static void
 c_write_global_declarations_1 (tree globals)
 {
   tree decl;
+  bool reconsider;
 
   /* Process the decls in the order they were written.  */
   for (decl = globals; decl; decl = TREE_CHAIN (decl))
@@ -7566,9 +7567,18 @@ c_write_global_declarations_1 (tree globals)
 	}
 
       wrapup_global_declaration_1 (decl);
-      wrapup_global_declaration_2 (decl);
-      check_global_declaration_1 (decl);
     }
+
+  do
+    {
+      reconsider = false;
+      for (decl = globals; decl; decl = TREE_CHAIN (decl))
+	reconsider |= wrapup_global_declaration_2 (decl);
+    }
+  while (reconsider);
+
+  for (decl = globals; decl; decl = TREE_CHAIN (decl))
+    check_global_declaration_1 (decl);
 }
 
 /* A subroutine of c_write_global_declarations Emit debug information for each
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f916b76c2fd3..d595aa3f2f99 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-29  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/24109
+	* gcc.c-torture/execute/20050929-1.c: New test.
+
 2005-09-29  Steven Bosscher  <stevenb@suse.de>
 
 	* gcc.dg/tree-ssa/ssa-ccp-11.c: Fix the test case and un-xfail.
diff --git a/gcc/testsuite/gcc.c-torture/execute/20050929-1.c b/gcc/testsuite/gcc.c-torture/execute/20050929-1.c
new file mode 100644
index 000000000000..7be2eb813f74
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/20050929-1.c
@@ -0,0 +1,20 @@
+/* PR middle-end/24109 */
+
+extern void abort (void);
+
+struct A { int i; int j; };
+struct B { struct A *a; struct A *b; };
+struct C { struct B *c; struct A *d; };
+struct C e = { &(struct B) { &(struct A) { 1, 2 }, &(struct A) { 3, 4 } }, &(struct A) { 5, 6 } };
+
+int
+main (void)
+{
+  if (e.c->a->i != 1 || e.c->a->j != 2)
+    abort ();
+  if (e.c->b->i != 3 || e.c->b->j != 4)
+    abort ();
+  if (e.d->i != 5 || e.d->j != 6)
+    abort ();
+  return 0;
+}