summaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorbothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4>2001-02-08 03:45:14 +0000
committerbothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4>2001-02-08 03:45:14 +0000
commit0a8085a4164a1976f5a74084297245efb1de1439 (patch)
tree56410d08025f541ecf008cbe7e962afa79ad1870 /gcc
parentb82875159e4869080f6c5c7cb807580470532c98 (diff)
downloadgcc-0a8085a4164a1976f5a74084297245efb1de1439.tar.gz
* 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@39534 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
-rw-r--r--gcc/java/ChangeLog7
-rw-r--r--gcc/java/check-init.c6
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 <per@bothner.com>
+
+ * 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 <jsm28@cam.ac.uk>
* 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;