From 4a83be51aef0d16a4e224a557f53ebb827618bf8 Mon Sep 17 00:00:00 2001 From: Per Bothner Date: Wed, 7 Feb 2001 19:45:14 -0800 Subject: [PATCH] check-init.c (check_init): Fix TRY_FINALLY_EXPR logic. * check-init.c (check_init): Fix TRY_FINALLY_EXPR logic. * check-init.c (check_init): Don't call done_alternative after processing loop code, as a LOOP_EXPR never terminates normally. From-SVN: r39534 --- gcc/java/ChangeLog | 7 +++++++ gcc/java/check-init.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index fa240b0c833..992396862cb 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,10 @@ +2001-02-07 Per Bothner + + * check-init.c (check_init): Fix TRY_FINALLY_EXPR logic. + + * check-init.c (check_init): Don't call done_alternative after + processing loop code, as a LOOP_EXPR never terminates normally. + 2001-02-08 Joseph S. Myers * gcj.texi: Change sources.redhat.com reference to gcc.gnu.org. diff --git a/gcc/java/check-init.c b/gcc/java/check-init.c index 9d891968d25..49df07291d5 100644 --- a/gcc/java/check-init.c +++ b/gcc/java/check-init.c @@ -451,7 +451,6 @@ check_init (exp, before) BEGIN_ALTERNATIVES (before, alt); alt.block = exp; check_init (TREE_OPERAND (exp, 0), before); - done_alternative (before, &alt); END_ALTERNATIVES (before, alt); return; } @@ -571,8 +570,9 @@ check_init (exp, before) { words tmp = ALLOC_WORDS (num_current_words); COPY (tmp, before); - check_init (TREE_OPERAND (exp, 0), tmp); - check_init (TREE_OPERAND (exp, 1), before); + check_init (TREE_OPERAND (exp, 0), before); + check_init (TREE_OPERAND (exp, 1), tmp); + UNION (before, before, tmp); FREE_WORDS (tmp); } return; -- 2.30.2