diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/c-typeck.c | 11 |
2 files changed, 6 insertions, 9 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5c839a1..b2840b6 100644 --- 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 98eeacd..73c120d 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; } |