c-typeck.c (process_init_element): Don't save_expr COMPOUND_LITERAL_EXPR if just...

	* c-typeck.c (process_init_element): Don't save_expr
	COMPOUND_LITERAL_EXPR if just its initializer will be used.

	* gcc.dg/gnu89-init-1.c: Add new tests.

From-SVN: r48868

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e95daea8cdf06843418974dcb9e53265d634bc3b..1629ba9a60b236c917a129ecbb75c926712d68ae 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-15  Jakub Jelinek  <jakub@redhat.com>
+
+       * c-typeck.c (process_init_element): Don't save_expr
+       COMPOUND_LITERAL_EXPR if just its initializer will be used.
+
 2002-01-15  David Edelsohn  <edelsohn@gnu.org>
 
        * config/rs6000/rs6000.c (rs6000_output_function_epilogue): Do not

diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index 2c476989c681e82e27e68fac13006e699e709379..fad00abbec37ac61913ad5f735f063aa4b68bb5c 100644 (file)
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -6618,7 +6618,14 @@ process_init_element (value)
 
   /* In the case of [LO ... HI] = VALUE, only evaluate VALUE once.  */
   if (constructor_range_stack)
-    value = save_expr (value);
+    {
+      /* If value is a compound literal and we'll be just using its
+        content, don't put it into a SAVE_EXPR.  */
+      if (TREE_CODE (value) != COMPOUND_LITERAL_EXPR
+         || !require_constant_value
+         || flag_isoc99)
+       value = save_expr (value);
+    }
 
   while (1)
     {

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5a8c11d2e5df7b916f13ce79d9bc6dc6f02dd61f..4ac978a44ded2ad5b24079dc49778642f6056052 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-15  Jakub Jelinek  <jakub@redhat.com>
+
+       * gcc.dg/gnu89-init-1.c: Add new tests.
+
 2002-01-15  Andreas Jaeger  <aj@suse.de>
 
        * gcc.dg/i386-mmx-1.c: Also run on x86-64.

diff --git a/gcc/testsuite/gcc.dg/gnu89-init-1.c b/gcc/testsuite/gcc.dg/gnu89-init-1.c
index 3cabeb443c402bdb53b7fe588517d904c17e60c6..07bf823535d8f5aaf0a2569b3babae16c41f6349 100644 (file)
--- a/gcc/testsuite/gcc.dg/gnu89-init-1.c
+++ b/gcc/testsuite/gcc.dg/gnu89-init-1.c
@@ -28,6 +28,8 @@ struct C g[3] = { [2] = (struct C) { 13 }, [1] = (const struct C) { 12 } };
 struct D h = { .j = (struct C) { 15 }, .i = 14 };
 struct D i[2] = { [1].j = (const struct C) { 17 },
                  [0] = { 0, (struct C) { 16 } } };
+struct C j[2][3] = { [0 ... 1] = { [0 ... 2] = (struct C) { 26 } } };
+struct C k[3][2] = { [0 ... 2][0 ... 1] = (const struct C) { 27 } };
 
 int main (void)
 {
@@ -55,5 +57,13 @@ int main (void)
     abort ();
   if (i[0].i || i[0].j.i != 16 || i[1].i || i[1].j.i != 17)
     abort ();
+  if (j[0][0].i != 26 || j[0][1].i != 26 || j[0][2].i != 26)
+    abort ();
+  if (j[1][0].i != 26 || j[1][1].i != 26 || j[1][2].i != 26)
+    abort ();
+  if (k[0][0].i != 27 || k[0][1].i != 27 || k[1][0].i != 27)
+    abort ();
+  if (k[1][1].i != 27 || k[2][0].i != 27 || k[2][1].i != 27)
+    abort ();
   exit (0);
 }