Index: tree-vectorizer.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-vectorizer.c,v
retrieving revision 2.46
diff -c -3 -p -r2.46 tree-vectorizer.c
*** tree-vectorizer.c	30 Nov 2004 23:28:54 -0000	2.46
--- tree-vectorizer.c	1 Dec 2004 18:42:56 -0000
*************** slpeel_make_loop_iterate_ntimes (struct 
*** 665,670 ****
--- 665,672 ----
    tree exit_label = tree_block_label (loop->single_exit->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;
  
    orig_cond = get_loop_exit_condition (loop);
    gcc_assert (orig_cond);
*************** slpeel_make_loop_iterate_ntimes (struct 
*** 677,690 ****
    gcc_assert (bsi_stmt (loop_exit_bsi) == orig_cond);
  
    if (exit_edge->flags & EDGE_TRUE_VALUE) /* 'then' edge exits the loop.  */
!     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);
  
-   begin_label = build1 (GOTO_EXPR, void_type_node, begin_label);
-   exit_label = build1 (GOTO_EXPR, void_type_node, exit_label);
    cond_stmt = build3 (COND_EXPR, TREE_TYPE (orig_cond), cond,
! 		     begin_label, exit_label);
    bsi_insert_before (&loop_exit_bsi, cond_stmt, BSI_SAME_STMT);
  
    /* Remove old loop exit test:  */
--- 679,698 ----
    gcc_assert (bsi_stmt (loop_exit_bsi) == orig_cond);
  
    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);
!     }
    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_stmt = build3 (COND_EXPR, TREE_TYPE (orig_cond), cond,
! 		     then_label, else_label);
    bsi_insert_before (&loop_exit_bsi, cond_stmt, BSI_SAME_STMT);
  
    /* Remove old loop exit test:  */