[gcc r9-9426] fold-const: Fix up ((1 << x) & y) != 0 folding for vectors [PR99225]

[gcc r9-9426] fold-const: Fix up ((1 << x) & y) != 0 folding for vectors [PR99225]

[Jakub Jelinek]

https://gcc.gnu.org/g:7c9f7293c995b662457b4e7aba97a6faa4d86dc5

commit r9-9426-g7c9f7293c995b662457b4e7aba97a6faa4d86dc5
Author: Jakub Jelinek <jakub@redhat.com>
Date:   Wed Feb 24 12:10:25 2021 +0100

    fold-const: Fix up ((1 << x) & y) != 0 folding for vectors [PR99225]
    
    This optimization was written purely with scalar integers in mind,
    can work fine even with vectors, but we can't use build_int_cst but
    need to use build_one_cst instead.
    
    2021-02-24  Jakub Jelinek  <jakub@redhat.com>
    
            PR tree-optimization/99225
            * fold-const.c (fold_binary_loc) <case NE_EXPR>: In (x & (1 << y)) != 0
            to ((x >> y) & 1) != 0 simplifications use build_one_cst instead of
            build_int_cst (..., 1).  Formatting fixes.
    
            * gcc.c-torture/compile/pr99225.c: New test.
    
    (cherry picked from commit 4de402ab60c54fff48cb7371644b024d10d7e5bb)

Diff:
---
 gcc/fold-const.c                              | 16 +++++++-------
 gcc/testsuite/gcc.c-torture/compile/pr99225.c | 31 +++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 75406d265f3..97083a83e5c 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -10701,23 +10701,23 @@ fold_binary_loc (location_t loc, enum tree_code code, tree type,
 	      && integer_onep (TREE_OPERAND (arg00, 0)))
 	    {
 	      tree tem = fold_build2_loc (loc, RSHIFT_EXPR, TREE_TYPE (arg00),
-				      arg01, TREE_OPERAND (arg00, 1));
+					  arg01, TREE_OPERAND (arg00, 1));
 	      tem = fold_build2_loc (loc, BIT_AND_EXPR, TREE_TYPE (arg0), tem,
-				 build_int_cst (TREE_TYPE (arg0), 1));
+				     build_one_cst (TREE_TYPE (arg0)));
 	      return fold_build2_loc (loc, code, type,
-				  fold_convert_loc (loc, TREE_TYPE (arg1), tem),
-				  arg1);
+				      fold_convert_loc (loc, TREE_TYPE (arg1),
+							tem), arg1);
 	    }
 	  else if (TREE_CODE (arg01) == LSHIFT_EXPR
 		   && integer_onep (TREE_OPERAND (arg01, 0)))
 	    {
 	      tree tem = fold_build2_loc (loc, RSHIFT_EXPR, TREE_TYPE (arg01),
-				      arg00, TREE_OPERAND (arg01, 1));
+					  arg00, TREE_OPERAND (arg01, 1));
 	      tem = fold_build2_loc (loc, BIT_AND_EXPR, TREE_TYPE (arg0), tem,
-				 build_int_cst (TREE_TYPE (arg0), 1));
+				     build_one_cst (TREE_TYPE (arg0)));
 	      return fold_build2_loc (loc, code, type,
-				  fold_convert_loc (loc, TREE_TYPE (arg1), tem),
-				  arg1);
+				      fold_convert_loc (loc, TREE_TYPE (arg1),
+							tem), arg1);
 	    }
 	}
 
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr99225.c b/gcc/testsuite/gcc.c-torture/compile/pr99225.c
new file mode 100644
index 00000000000..0ef7602035e
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr99225.c
@@ -0,0 +1,31 @@
+/* PR tree-optimization/99225 */
+
+typedef int V __attribute__((vector_size (4 * sizeof (int))));
+
+void
+foo (V *x)
+{
+  x[2] = (x[0] & (1 << x[1])) != 0;
+}
+
+void
+bar (V *x)
+{
+  x[2] = ((1 << x[1]) & x[0]) != 0;
+}
+
+void
+baz (V *x)
+{
+  V a = 1 << x[1];
+  V b = a & x[0];
+  x[2] = b != 0;
+}
+
+void
+qux (V *x)
+{
+  V a = 1 << x[1];
+  V b = x[0] & a;
+  x[2] = b != 0;
+}