diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/verify.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 11ad1a5..87d02c5 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,5 +1,10 @@ 2001-01-21 Per Bothner <per@bothner.com> + * verify.c (merge_type_state): Stil may have to merge even if + LABEL_VERIFIED (label). + +2001-01-21 Per Bothner <per@bothner.com> + * parse.y (method_header): Don't set the DECL_NAME of a FUNCTION_DECL to a EXPR_WITH_FILE_LOCATION - that is just too fragile and wrong. diff --git a/gcc/java/verify.c b/gcc/java/verify.c index 23b3088..bc0bb73 100644 --- a/gcc/java/verify.c +++ b/gcc/java/verify.c @@ -232,7 +232,7 @@ merge_type_state (label) int cur_length = stack_pointer + nlocals; tree vec = LABEL_TYPE_STATE (label); tree return_map; - if (vec == NULL_TREE || !LABEL_VERIFIED (label)) + if (vec == NULL_TREE) { if (!vec) { |