tree-optimization/96579 - another special-operands fix in reassoc

This makes sure to put special-ops expanded rhs left where
expression rewrite expects it.

2020-08-27  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/96579
	* tree-ssa-reassoc.c (linearize_expr_tree): If we expand
	rhs via special ops make sure to swap operands.

	* gcc.dg/pr96579.c: New testcase.

(cherry picked from commit ff7463172e564c5dd2432d7af8eaa0124cbd4af7)

diff --git a/gcc/testsuite/gcc.dg/pr96579.c b/gcc/testsuite/gcc.dg/pr96579.c
new file mode 100644 (file)
index 0000000..49fdcb4
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr96579.c
@@ -0,0 +1,4 @@
+/* { dg-do compile } */
+/* { dg-options "-O -fno-tree-forwprop -ffast-math -fno-tree-vrp" } */
+
+#include "pr96370.c"

diff --git a/gcc/tree-ssa-reassoc.c b/gcc/tree-ssa-reassoc.c
index c45b9e95c557459429a7c7282dc968795dd58029..213969929bd0331911cfc5c061a3efbec0e6a2d6 100644 (file)
--- a/gcc/tree-ssa-reassoc.c
+++ b/gcc/tree-ssa-reassoc.c
@@ -5514,13 +5514,20 @@ linearize_expr_tree (vec<operand_entry *> *ops, gimple *stmt,
 
       if (!binrhsisreassoc)
        {
-         if (!try_special_add_to_ops (ops, rhscode, binrhs, binrhsdef))
+         bool swap = false;
+         if (try_special_add_to_ops (ops, rhscode, binrhs, binrhsdef))
+           /* If we add ops for the rhs we expect to be able to recurse
+              to it via the lhs during expression rewrite so swap
+              operands.  */
+           swap = true;
+         else
            add_to_ops_vec (ops, binrhs);
 
          if (!try_special_add_to_ops (ops, rhscode, binlhs, binlhsdef))
            add_to_ops_vec (ops, binlhs);
 
-         return;
+         if (!swap)
+           return;
        }
 
       if (dump_file && (dump_flags & TDF_DETAILS))
@@ -5539,6 +5546,8 @@ linearize_expr_tree (vec<operand_entry *> *ops, gimple *stmt,
          fprintf (dump_file, " is now ");
          print_gimple_stmt (dump_file, stmt, 0);
        }
+      if (!binrhsisreassoc)
+       return;
 
       /* We want to make it so the lhs is always the reassociative op,
         so swap.  */