From 63f88450d46e1453137aa58c1808134fe68a8f18 Mon Sep 17 00:00:00 2001 From: rakdver Date: Fri, 27 Apr 2007 08:20:39 +0000 Subject: * tree-ssa-loop-im.c (determine_invariantness_stmt): Attempt to transform only GIMPLE_MODIFY_STMTs. * tree-complex.c (expand_complex_operations_1): Ditto. (expand_complex_div_wide): Do not create gotos in COND_EXPR branches. * tree-ssa-loop-manip.c (build_if_stmt): Removed. (tree_transform_and_unroll_loop): Do not create gotos in COND_EXPR branches. * value-prof.c (tree_divmod_fixed_value, tree_mod_pow2, tree_mod_subtract, tree_ic, tree_stringop_fixed_value): Ditto. * omp-low.c (expand_parallel_call, expand_omp_for_generic, expand_omp_for_static_chunk, expand_omp_for_static_nochunk): Ditto. * tree-vectorizer.c (slpeel_make_loop_iterate_ntimes, slpeel_add_loop_guard): Ditto. * tree-mudflap.c (mf_build_check_statement_for): Ditto. * lambda-code.c (perfect_nestify): Ditto. * tree-iterator.c (tsi_split_statement_list_before): Fix splitting before the first statement. * tree-optimize.c (execute_free_datastructures): Fix comments. (execute_free_cfg_annotations): Do not call disband_implicit_edges. * tree-flow.h (disband_implicit_edges): Declaration removed. * tree-cfg.c (make_cond_expr_edges): Remove gotos from COND_EXPR branches. (cleanup_dead_labels, tree_redirect_edge_and_branch): Handle COND_EXPRs without gotos. (disband_implicit_edges, has_label_p): Removed. (tree_verify_flow_info): Verify that COND_EXPR branches are empty. (tree_lv_add_condition_to_bb): Do not create gotos in COND_EXPR branches. * tree.c (build3_stat): Mark COND_EXPRs used as statements as having side effects. * tree-pretty-print.c (dump_implicit_edges): Dump implicit edges also for COND_EXPRs. * cfgexpand.c (label_rtx_for_bb): New function. (expand_gimple_cond_expr): Do not expect gotos in COND_EXPR branches. Use label_rtx_for_bb to find the labels. (expand_gimple_basic_block): Remove RETURN_EXPR at the end of the last block. Detect fallthru edges. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@124214 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/tree-vectorizer.c | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) (limited to 'gcc/tree-vectorizer.c') diff --git a/gcc/tree-vectorizer.c b/gcc/tree-vectorizer.c index 3c41c5c4ee4..d235a4917ba 100644 --- a/gcc/tree-vectorizer.c +++ b/gcc/tree-vectorizer.c @@ -767,12 +767,8 @@ slpeel_make_loop_iterate_ntimes (struct loop *loop, tree niters) block_stmt_iterator loop_cond_bsi; block_stmt_iterator incr_bsi; bool insert_after; - tree begin_label = tree_block_label (loop->latch); - tree exit_label = tree_block_label (single_exit (loop)->dest); tree init = build_int_cst (TREE_TYPE (niters), 0); tree step = build_int_cst (TREE_TYPE (niters), 1); - tree then_label; - tree else_label; LOC loop_loc; orig_cond = get_loop_exit_condition (loop); @@ -784,20 +780,12 @@ slpeel_make_loop_iterate_ntimes (struct loop *loop, tree niters) &incr_bsi, insert_after, &indx_before_incr, &indx_after_incr); if (exit_edge->flags & EDGE_TRUE_VALUE) /* 'then' edge exits the loop. */ - { - cond = build2 (GE_EXPR, boolean_type_node, indx_after_incr, niters); - then_label = build1 (GOTO_EXPR, void_type_node, exit_label); - else_label = build1 (GOTO_EXPR, void_type_node, begin_label); - } + cond = build2 (GE_EXPR, boolean_type_node, indx_after_incr, niters); else /* 'then' edge loops back. */ - { - cond = build2 (LT_EXPR, boolean_type_node, indx_after_incr, niters); - then_label = build1 (GOTO_EXPR, void_type_node, begin_label); - else_label = build1 (GOTO_EXPR, void_type_node, exit_label); - } + cond = build2 (LT_EXPR, boolean_type_node, indx_after_incr, niters); cond_stmt = build3 (COND_EXPR, TREE_TYPE (orig_cond), cond, - then_label, else_label); + NULL_TREE, NULL_TREE); bsi_insert_before (&loop_cond_bsi, cond_stmt, BSI_SAME_STMT); /* Remove old loop exit test: */ @@ -935,19 +923,15 @@ slpeel_add_loop_guard (basic_block guard_bb, tree cond, basic_block exit_bb, { block_stmt_iterator bsi; edge new_e, enter_e; - tree cond_stmt, then_label, else_label; + tree cond_stmt; enter_e = EDGE_SUCC (guard_bb, 0); enter_e->flags &= ~EDGE_FALLTHRU; enter_e->flags |= EDGE_FALSE_VALUE; bsi = bsi_last (guard_bb); - then_label = build1 (GOTO_EXPR, void_type_node, - tree_block_label (exit_bb)); - else_label = build1 (GOTO_EXPR, void_type_node, - tree_block_label (enter_e->dest)); cond_stmt = build3 (COND_EXPR, void_type_node, cond, - then_label, else_label); + NULL_TREE, NULL_TREE); bsi_insert_after (&bsi, cond_stmt, BSI_NEW_STMT); /* Add new edge to connect guard block to the merge/loop-exit block. */ new_e = make_edge (guard_bb, exit_bb, EDGE_TRUE_VALUE); -- cgit v1.2.3