From: Alexandre Oliva <aoliva@redhat.com>
Date: Mon, 14 Jun 2010 19:18:18 +0000 (+0000)
Subject: re PR debug/43650 ("-fcompare-debug failure" with "-O2 -fpeel-loops -fgraphite-identity")
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=22963fee5bbfa9de82c08664af99fa24de267872;p=gcc.git

re PR debug/43650 ("-fcompare-debug failure" with "-O2 -fpeel-loops -fgraphite-identity")

PR debug/43650
PR debug/44181
PR debug/44247
* tree-ssa-loop-manip.c (tree_transform_and_unroll_loop): Skip
debug stmts.
(canonicalize_loop_ivs): Likewise.

From-SVN: r160762
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ea90541b4a3..8cad980875b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2010-06-14  Alexandre Oliva  <aoliva@redhat.com>
+
+	PR debug/43650
+	PR debug/44181
+	PR debug/44247
+	* tree-ssa-loop-manip.c (tree_transform_and_unroll_loop): Skip
+	debug stmts.
+	(canonicalize_loop_ivs): Likewise.
+
 2010-06-14  Alexandre Oliva  <aoliva@redhat.com>
 
 	PR debug/43656
diff --git a/gcc/tree-ssa-loop-manip.c b/gcc/tree-ssa-loop-manip.c
index 219c71b9a96..c6dc8ed55ea 100644
--- a/gcc/tree-ssa-loop-manip.c
+++ b/gcc/tree-ssa-loop-manip.c
@@ -1081,7 +1081,7 @@ tree_transform_and_unroll_loop (struct loop *loop, unsigned factor,
 
   /* Finally create the new counter for number of iterations and add the new
      exit instruction.  */
-  bsi = gsi_last_bb (exit_bb);
+  bsi = gsi_last_nondebug_bb (exit_bb);
   exit_if = gsi_stmt (bsi);
   create_iv (exit_base, exit_step, NULL_TREE, loop,
 	     &bsi, false, &ctr_before, &ctr_after);
@@ -1217,7 +1217,7 @@ canonicalize_loop_ivs (struct loop *loop, tree *nit, bool bump_in_latch)
 	gsi_insert_seq_on_edge_immediate (loop_preheader_edge (loop), stmts);
     }
 
-  gsi = gsi_last_bb (bump_in_latch ? loop->latch : loop->header);
+  gsi = gsi_last_nondebug_bb (bump_in_latch ? loop->latch : loop->header);
   create_iv (build_int_cst_type (type, 0), build_int_cst (type, 1), NULL_TREE,
 	     loop, &gsi, bump_in_latch, &var_before, NULL);