re PR middle-end/54782 (ICE: in change_scope, at final.c:1543 with -O -ffast-math...

2012-10-03  Dehao Chen  <dehao@google.com>

gcc:
	PR middle-end/54782
	* tree-cfg.c (move_block_to_fn): Update lexical block for phi_args.

testsuite:
	PR middle-end/54782
	* gcc.dg/pr54782.c: New test.

From-SVN: r192049

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fcea56414924efcc8b8afbdc6cb52503465bd0a1..b51cbbdb29a9db793c01cd157cc28334551b99d5 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-03  Dehao Chen  <dehao@google.com>
+
+       PR middle-end/54782
+       * tree-cfg.c (move_block_to_fn): Update lexical block for phi_args.
+
 2012-10-03  Vladimir Makarov  <vmakarov@redhat.com>
 
        * reginfo.c (max_regno_since_last_resize): New.

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 659fa534d9f5dd34df4561716ca8335d7d9a7fd9..02226982e2b5914344bc1ad50173caf39b4e420b 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-03  Dehao Chen  <dehao@google.com>
+
+       PR middle-end/54782
+       * gcc.dg/pr54782.c: New test.
+
 2012-10-03  Jakub Jelinek  <jakub@redhat.com>
 
        PR c++/54777

diff --git a/gcc/testsuite/gcc.dg/pr54782.c b/gcc/testsuite/gcc.dg/pr54782.c
new file mode 100644 (file)
index 0000000..2a30754
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr54782.c
@@ -0,0 +1,18 @@
+/* { dg-do compile } */
+/* { dg-options "-O -ffast-math -ftree-parallelize-loops=2 -g" } */
+
+struct S
+{
+  int n;
+  float *a;
+};
+
+int
+foo (struct S *s)
+{
+  float sum = 0;
+  int i;
+  for (i = 0; i < s->n; i++)
+    sum += s->a[i];
+  return sum;
+}

diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index b14a3b929f518f00cf109a199f0737c169f6630b..af277b79e099feda7ea295328f0c8155c1d10865 100644 (file)
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -6322,6 +6322,7 @@ move_block_to_fn (struct function *dest_cfun, basic_block bb,
       use_operand_p use;
       tree op = PHI_RESULT (phi);
       ssa_op_iter oi;
+      unsigned i;
 
       if (virtual_operand_p (op))
        {
@@ -6340,6 +6341,23 @@ move_block_to_fn (struct function *dest_cfun, basic_block bb,
            SET_USE (use, replace_ssa_name (op, d->vars_map, dest_cfun->decl));
        }
 
+      for (i = 0; i < EDGE_COUNT (bb->preds); i++)
+       {
+         location_t locus = gimple_phi_arg_location (phi, i);
+         tree block = LOCATION_BLOCK (locus);
+
+         if (locus == UNKNOWN_LOCATION)
+           continue;
+         if (d->orig_block == NULL_TREE || block == d->orig_block)
+           {
+             if (d->new_block == NULL_TREE)
+               locus = LOCATION_LOCUS (locus);
+             else
+               locus = COMBINE_LOCATION_DATA (line_table, locus, d->new_block);
+             gimple_phi_arg_set_location (phi, i, locus);
+           }
+       }
+
       gsi_next (&si);
     }