diff options
| author | Steven Bosscher <steven@gcc.gnu.org> | 2004-11-24 11:41:38 +0000 |
|---|---|---|
| committer | Steven Bosscher <steven@gcc.gnu.org> | 2004-11-24 11:41:38 +0000 |
| commit | 16df8078b8ea2cf3ce37f47e62cdc66c69fe6c70 (patch) | |
| tree | b1c2513f30d70b29ff11a260b5524e5f0785c12c /gcc/java/parse.y | |
| parent | f39e46bac1fa7fa916b9d415d323fa7353c5e91a (diff) | |
| download | gcc-16df8078b8ea2cf3ce37f47e62cdc66c69fe6c70.zip gcc-16df8078b8ea2cf3ce37f47e62cdc66c69fe6c70.tar.gz gcc-16df8078b8ea2cf3ce37f47e62cdc66c69fe6c70.tar.bz2 | |
expr.c (expand_expr_real_1): Remove cases for EXIT_BLOCK_EXPR and LABELED_BLOCK_EXPR.
gcc/
* expr.c (expand_expr_real_1): Remove cases for EXIT_BLOCK_EXPR
and LABELED_BLOCK_EXPR.
* gimplify.c (gimplify_labeled_block_expr): Remove.
(gimplify_exit_block_expr): Remove.
(gimplify_expr): Don't call them.
* tree-inline.c (copy_body_r): Don't handle EXIT_BLOCK_EXPR
and LABELED_BLOCK_EXPR.
(estimate_num_insns_1): Likewise.
(walk_tree): Likewise.
* tree-pretty-print.c (dump_generic_node): Don't handle
EXIT_BLOCK_EXPR and LABELED_BLOCK_EXPR.
* tree.def (EXIT_BLOCK_EXPR): Moved to java-tree.def.
(LABELED_BLOCK_EXPR): Likewise.
* tree.h (LABELED_BLOCK_LABEL): Moved to java-tree.h.
(LABELED_BLOCK_BODY): Likewise.
(EXIT_BLOCK_LABELED_BLOCK): Likewise.
(EXIT_BLOCK_RETURN): Removed.
java/
* java-gimplify.c (java_gimplify_labeled_block_expr): New function.
(java_gimplify_exit_block_expr): New function.
(java_gimplify_expr): Use them to gimplify EXIT_BLOCK_EXPR and
LABELED_BLOCK_EXPR.
* java-tree.def (LABELED_BLOCK_EXPR): Moved from tree.def.
(EXIT_BLOCK_EXPR): Likewise.
* java-tree.h (LABELED_BLOCK_LABEL): Moved from tree.h.
(LABELED_BLOCK_BODY): Likewise.
(EXIT_BLOCK_LABELED_BLOCK): Likewise.
* jcf-write.c (generate_bytecode_insns): Don't handle the unused
EXIT_BLOCK_RETURN operand. Use EXIT_BLOCK_LABELED_BLOCK instead of
TREE_OPERAND.
* lang.c (java_tree_inlining_walk_subtrees): Handle EXIT_BLOCK_EXPR.
(java_dump_tree): Use LABELED_BLOCK_LABEL, LABELED_BLOCK_BODY, and
EXIT_BLOCK_LABELED_BLOCK instead of TREE_OPERAND. Don't handle the
second operand of EXIT_BLOCK_EXPR.
* parse.y (find_expr_with_wfl): Use LABELED_BLOCK_BODY instead of
TREE_OPERAND.
(build_bc_statement): Use build1 to build EXIT_BLOCK_EXPR nodes.
From-SVN: r91149
Diffstat (limited to 'gcc/java/parse.y')
| -rw-r--r-- | gcc/java/parse.y | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/gcc/java/parse.y b/gcc/java/parse.y index d02a448..1c1a686 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -3255,7 +3255,7 @@ find_expr_with_wfl (tree node) continue; case LABELED_BLOCK_EXPR: - node = TREE_OPERAND (node, 1); + node = LABELED_BLOCK_BODY (node); continue; default: @@ -11747,8 +11747,6 @@ java_complete_lhs (tree node) return node; case EXIT_BLOCK_EXPR: - /* We don't complete operand 1, because it's the return value of - the EXIT_BLOCK_EXPR which doesn't exist it Java */ return patch_bc_statement (node); case CASE_EXPR: @@ -15269,8 +15267,7 @@ build_bc_statement (int location, int is_break, tree name) } /* Unlabeled break/continue will be handled during the break/continue patch operation */ - break_continue = build2 (EXIT_BLOCK_EXPR, NULL_TREE, - label_block_expr, NULL_TREE); + break_continue = build1 (EXIT_BLOCK_EXPR, NULL_TREE, label_block_expr); IS_BREAK_STMT_P (break_continue) = is_break; TREE_SIDE_EFFECTS (break_continue) = 1; |