From 06ac89d1ca5a07462804d35fff86331f9f61eae4 Mon Sep 17 00:00:00 2001 From: Sebastian Pop Date: Mon, 29 May 2006 18:01:16 +0200 Subject: [PATCH] re PR tree-optimization/27745 (ICE in execute_todo with -O2 -ftree-loop-linear) PR middle-end/27745 * lambda-code.c (perfect_nestify): Don't copy statements in the inner loop: move them to the inner loop header. From-SVN: r114205 --- gcc/ChangeLog | 6 ++++++ gcc/lambda-code.c | 42 +++++++----------------------------------- 2 files changed, 13 insertions(+), 35 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index eba12e76fb2..dc310f69498 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2006-05-29 Sebastian Pop + + PR middle-end/27745 + * lambda-code.c (perfect_nestify): Don't copy statements + in the inner loop: move them to the inner loop header. + 2006-05-29 Diego Novillo PR 26237 diff --git a/gcc/lambda-code.c b/gcc/lambda-code.c index 8ed9610c6b4..2a03fd31cd5 100644 --- a/gcc/lambda-code.c +++ b/gcc/lambda-code.c @@ -2506,50 +2506,22 @@ perfect_nestify (struct loops *loops, if (dominated_by_p (CDI_DOMINATORS, loop->inner->header, bbs[i])) { - for (bsi = bsi_last (bbs[i]); !bsi_end_p (bsi);) + block_stmt_iterator header_bsi + = bsi_after_labels (loop->inner->header); + + for (bsi = bsi_start (bbs[i]); !bsi_end_p (bsi);) { - use_operand_p use_p; - imm_use_iterator imm_iter; - tree imm_stmt; tree stmt = bsi_stmt (bsi); if (stmt == exit_condition || not_interesting_stmt (stmt) || stmt_is_bumper_for_loop (loop, stmt)) { - if (!bsi_end_p (bsi)) - bsi_prev (&bsi); + bsi_next (&bsi); continue; } - - /* Make copies of this statement to put it back next - to its uses. */ - FOR_EACH_IMM_USE_STMT (imm_stmt, imm_iter, - TREE_OPERAND (stmt, 0)) - { - if (!exit_phi_for_loop_p (loop->inner, imm_stmt)) - { - block_stmt_iterator tobsi; - tree newname; - tree newstmt; - - newstmt = unshare_expr (stmt); - tobsi = bsi_after_labels (bb_for_stmt (imm_stmt)); - newname = TREE_OPERAND (newstmt, 0); - newname = SSA_NAME_VAR (newname); - newname = make_ssa_name (newname, newstmt); - TREE_OPERAND (newstmt, 0) = newname; - - FOR_EACH_IMM_USE_ON_STMT (use_p, imm_iter) - SET_USE (use_p, newname); - - bsi_insert_before (&tobsi, newstmt, BSI_SAME_STMT); - update_stmt (newstmt); - update_stmt (imm_stmt); - } - } - if (!bsi_end_p (bsi)) - bsi_prev (&bsi); + + bsi_move_before (&bsi, &header_bsi); } } else -- 2.30.2