From 5d5e98dc75c0e81e938501bb06622023c7eb9e3b Mon Sep 17 00:00:00 2001 From: Volker Reichelt Date: Fri, 21 Apr 2006 22:58:28 +0000 Subject: [PATCH] * c-typeck.c (pop_init_level): Simplify. From-SVN: r113152 --- gcc/ChangeLog | 4 ++++ gcc/c-typeck.c | 11 ++--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5c839a1da79..b2840b6ded9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2006-04-21 Volker Reichelt + + * c-typeck.c (pop_init_level): Simplify. + 2006-04-21 Steve Ellcey * config/pa/t-pa64: Add dependencies on $(GCC_PASSES). diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c index 98eeacd552a..73c120d16a3 100644 --- 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; } -- 2.30.2