diff options
| author | reichelt <reichelt@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-04-21 22:58:28 +0000 |
|---|---|---|
| committer | reichelt <reichelt@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-04-21 22:58:28 +0000 |
| commit | 09d2b71abf963a21323283769a9fa81ac43ec71e (patch) | |
| tree | e9d24e5be59e36381d39f8beaad7b73a6703298b | |
| parent | 64c2421fc6a84a0ef6ec6875c05ccd877a5bb951 (diff) | |
| download | ppe42-gcc-09d2b71abf963a21323283769a9fa81ac43ec71e.tar.gz ppe42-gcc-09d2b71abf963a21323283769a9fa81ac43ec71e.zip | |
* c-typeck.c (pop_init_level): Simplify.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@113152 138bc75d-0d04-0410-961f-82ee72b054a4
| -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 5c839a1da79..b2840b6ded9 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 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; } |
