re PR debug/42897 (yet another ice in verify_ssa)

PR debug/42897
* gimple-iterator.c (gsi_remove): Propagate only PHI DEFs removed
permanently.

From-SVN: r157259

gcc/ChangeLog

 2010-03-06  Alexandre Oliva  <aoliva@redhat.com>
 
 	PR debug/42897
+	* gimple-iterator.c (gsi_remove): Propagate only PHI DEFs removed
+	permanently.
+
+2010-03-06  Alexandre Oliva  <aoliva@redhat.com>
+
+	PR debug/42897
 	* tree-vect-loop.c (vect_transform_loop): Kill out-of-loop debug
 	uses of relevant DEFs that are dead outside the loop too.
 

gcc/gimple-iterator.c

@@ -474,7 +474,8 @@ gsi_remove (gimple_stmt_iterator *i, bool remove_permanently)
   gimple_seq_node cur, next, prev;
   gimple stmt = gsi_stmt (*i);
 
-  insert_debug_temps_for_defs (i);
+  if (gimple_code (stmt) != GIMPLE_PHI)
+    insert_debug_temps_for_defs (i);
 
   /* Free all the data flow information for STMT.  */
   gimple_set_bb (stmt, NULL);

gcc/tree-phinodes.c

@@ -473,6 +473,10 @@ void
 remove_phi_node (gimple_stmt_iterator *gsi, bool release_lhs_p)
 {
   gimple phi = gsi_stmt (*gsi);
+
+  if (release_lhs_p)
+    insert_debug_temps_for_defs (gsi);
+
   gsi_remove (gsi, false);
 
   /* If we are deleting the PHI node, then we should release the