tree-ssa-reassoc.c (sort_by_operand_rank): Skip checking gimple_bb when there is...

gcc/ChangeLog:

2016-05-24  Kugan Vivekanandarajah  <kuganv@linaro.org>

	* tree-ssa-reassoc.c (sort_by_operand_rank): Skip checking gimple_bb
	when there is stmt_to_insert.

gcc/testsuite/ChangeLog:

2016-05-24  Kugan Vivekanandarajah  <kuganv@linaro.org>

	* gcc.dg/tree-ssa/reassoc-44.c: New test.

From-SVN: r236673

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b07aa80..238cd07 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-05-24  Kugan Vivekanandarajah  <kuganv@linaro.org>
+
+       * tree-ssa-reassoc.c (sort_by_operand_rank): Skip checking gimple_bb
+       when there is stmt_to_insert.
+
 2016-05-24  Martin Sebor  <msebor@redhat.com>
 
        PR c++/71147

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a2821a7..d81eedd 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2016-05-24  Kugan Vivekanandarajah  <kuganv@linaro.org>
+
+       * gcc.dg/tree-ssa/reassoc-44.c: New test.
+
 2016-05-24  Pat Haugen  <pthaugen@us.ibm.com>
 
        PR target/71050

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-44.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-44.c
new file mode 100644 (file)
index 0000000..1d946f6
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-44.c
@@ -0,0 +1,9 @@
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+unsigned int a;
+int b, c;
+void fn1 ()
+{
+  b = a + c + c;
+}

diff --git a/gcc/tree-ssa-reassoc.c b/gcc/tree-ssa-reassoc.c
index 3b02667..c9ed679 100644 (file)
--- a/gcc/tree-ssa-reassoc.c
+++ b/gcc/tree-ssa-reassoc.c
@@ -519,6 +519,8 @@ sort_by_operand_rank (const void *pa, const void *pb)
         See PR60418.  */
       if (!SSA_NAME_IS_DEFAULT_DEF (oea->op)
          && !SSA_NAME_IS_DEFAULT_DEF (oeb->op)
+         && !oea->stmt_to_insert
+         && !oeb->stmt_to_insert
          && SSA_NAME_VERSION (oeb->op) != SSA_NAME_VERSION (oea->op))
        {
          gimple *stmta = SSA_NAME_DEF_STMT (oea->op);