+Mon Mar 20 08:58:51 2000 Alexandre Petit-Bianco <apbianco@cygnus.com>
+
+ * jcf-write.c (generate_bytecode_insns): TRY_FINALLY_EXPR:
+ properly initialize `finished_label.' Don't emit gotos for empty
+ try statements.
+
2000-03-19 Martin v. Löwis <loewis@informatik.hu-berlin.de>
* except.c (emit_handlers): Clear catch_clauses_last.
tree finally = TREE_OPERAND (exp, 1);
tree return_link, exception_decl;
- finished_label = finally_label = start_label = NULL;
+ finally_label = start_label = NULL;
return_link = exception_decl = NULL_TREE;
+ finished_label = gen_jcf_label (state);
/* If the finally clause happens to be empty, set a flag so we
remember to just skip it. */
exception_type = build_pointer_type (throwable_type_node);
exception_decl = build_decl (VAR_DECL, NULL_TREE, exception_type);
- finished_label = gen_jcf_label (state);
finally_label = gen_jcf_label (state);
start_label = get_jcf_label_here (state);
finally_label->pc = PENDING_CLEANUP_PC;
emit_jsr (finally_label, state);
}
- if (CAN_COMPLETE_NORMALLY (try_block))
+ if (CAN_COMPLETE_NORMALLY (try_block)
+ && BLOCK_EXPR_BODY (try_block) != empty_stmt_node)
emit_goto (finished_label, state);
/* Handle exceptions. */