2012-06-01 Richard Guenther <rguenther@suse.de>

	* tree-loop-distribution.c (stmt_has_scalar_dependences_outside_loop):
	Handle PHIs.
	(classify_partition): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@188106 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c7a6565..12541e8 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2012-06-01  Richard Guenther  <rguenther@suse.de>
 
+       * tree-loop-distribution.c (stmt_has_scalar_dependences_outside_loop):
+       Handle PHIs.
+       (classify_partition): Likewise.
+
+2012-06-01  Richard Guenther  <rguenther@suse.de>
+
        * tree-loop-distribution.c (enum partition_kind): New enum.
        (struct partition_s): Add kind and main_stmt members.
        (partition_alloc): Initialize kind to PKIND_NORMAL.

diff --git a/gcc/tree-loop-distribution.c b/gcc/tree-loop-distribution.c
index 84a8717..92464a6 100644 (file)
--- a/gcc/tree-loop-distribution.c
+++ b/gcc/tree-loop-distribution.c
@@ -129,6 +129,9 @@ stmt_has_scalar_dependences_outside_loop (loop_p loop, gimple stmt)
   def_operand_p def_p;
   ssa_op_iter op_iter;
 
+  if (gimple_code (stmt) == GIMPLE_PHI)
+    return ssa_name_has_uses_outside_loop_p (gimple_phi_result (stmt), loop);
+
   FOR_EACH_SSA_DEF_OPERAND (def_p, stmt, op_iter, SSA_OP_DEF)
     if (ssa_name_has_uses_outside_loop_p (DEF_FROM_PTR (def_p), loop))
       return true;
@@ -813,8 +816,7 @@ classify_partition (loop_p loop, struct graph *rdg, partition_t partition)
       /* If the stmt has uses outside of the loop fail.
         ???  If the stmt is generated in another partition that
         is not created as builtin we can ignore this.  */
-      if (gimple_code (stmt) != GIMPLE_PHI
-         && stmt_has_scalar_dependences_outside_loop (loop, stmt))
+      if (stmt_has_scalar_dependences_outside_loop (loop, stmt))
        {
          if (dump_file && (dump_flags & TDF_DETAILS))
            fprintf (dump_file, "not generating builtin, partition has "