* c-typeck.c (pop_init_level): Simplify.

From-SVN: r113152

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5c839a1da7912daa7d590ba141e36480caa78aa1..b2840b6ded964d03bb55b638097778aa89390259 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-21  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+       * c-typeck.c (pop_init_level): Simplify.
+
 2006-04-21  Steve Ellcey  <sje@cup.hp.com>
 
        * config/pa/t-pa64: Add dependencies on $(GCC_PASSES).

diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index 98eeacd552a0380b1b8a9ebcca04c40cd6b20843..73c120d16a30d0332f6da9237b447a7b96515613 100644 (file)
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -5442,15 +5442,8 @@ pop_init_level (int implicit)
   constructor_stack = p->next;
   free (p);
 
-  if (ret.value == 0)
-    {
-      if (constructor_stack == 0)
-       {
-         ret.value = error_mark_node;
-         return ret;
-       }
-      return ret;
-    }
+  if (ret.value == 0 && constructor_stack == 0)
+    ret.value = error_mark_node;
   return ret;
 }