From a95015b6cd1d68d540e1805686d534e88ec6bfbd Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Mon, 20 Jun 2011 13:49:27 +0200 Subject: [PATCH] ChangeLog gcc/ 2011-06-20 Kai Tietz * fold-const.c (fold_binary_loc): Add missing folding for truth-not operations in combination with binary and. ChangeLog gcc/testsuite/ 2011-06-20 Kai Tietz * gcc.dg/binop-notand1.c: New test. * gcc.dg/binop-notand2.c: New test. * gcc.dg/binop-notand3.c: New test. * gcc.dg/binop-notand4.c: New test. * gcc.dg/binop-notand5.c: New test. * gcc.dg/binop-notand6.c: New test. From-SVN: r175206 --- gcc/ChangeLog | 6 ++++++ gcc/fold-const.c | 22 ++++++++++++++++++---- gcc/testsuite/ChangeLog | 9 +++++++++ gcc/testsuite/gcc.dg/binop-notand1.c | 11 +++++++++++ gcc/testsuite/gcc.dg/binop-notand2.c | 11 +++++++++++ gcc/testsuite/gcc.dg/binop-notand3.c | 11 +++++++++++ gcc/testsuite/gcc.dg/binop-notand4.c | 11 +++++++++++ gcc/testsuite/gcc.dg/binop-notand5.c | 11 +++++++++++ gcc/testsuite/gcc.dg/binop-notand6.c | 11 +++++++++++ 9 files changed, 99 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/binop-notand1.c create mode 100644 gcc/testsuite/gcc.dg/binop-notand2.c create mode 100644 gcc/testsuite/gcc.dg/binop-notand3.c create mode 100644 gcc/testsuite/gcc.dg/binop-notand4.c create mode 100644 gcc/testsuite/gcc.dg/binop-notand5.c create mode 100644 gcc/testsuite/gcc.dg/binop-notand6.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 89c5f65c372..673dd46ae14 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2011-06-20 Kai Tietz + + * fold-const.c (fold_binary_loc): Add missing + folding for truth-not operations in combination + with binary and. + 2011-06-20 Bernd Schmidt * regrename.c (do_replace): Don't update notes. diff --git a/gcc/fold-const.c b/gcc/fold-const.c index c39d33e1da2..e48aae9f4ce 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -10866,13 +10866,19 @@ fold_binary_loc (location_t loc, if (operand_equal_p (arg0, arg1, 0)) return non_lvalue_loc (loc, fold_convert_loc (loc, type, arg0)); - /* ~X & X is always zero. */ - if (TREE_CODE (arg0) == BIT_NOT_EXPR + /* ~X & X, (X == 0) & X, and !X & X are always zero. */ + if ((TREE_CODE (arg0) == BIT_NOT_EXPR + || TREE_CODE (arg0) == TRUTH_NOT_EXPR + || (TREE_CODE (arg0) == EQ_EXPR + && integer_zerop (TREE_OPERAND (arg0, 1)))) && operand_equal_p (TREE_OPERAND (arg0, 0), arg1, 0)) return omit_one_operand_loc (loc, type, integer_zero_node, arg1); - /* X & ~X is always zero. */ - if (TREE_CODE (arg1) == BIT_NOT_EXPR + /* X & ~X , X & (X == 0), and X & !X are always zero. */ + if ((TREE_CODE (arg1) == BIT_NOT_EXPR + || TREE_CODE (arg1) == TRUTH_NOT_EXPR + || (TREE_CODE (arg1) == EQ_EXPR + && integer_zerop (TREE_OPERAND (arg1, 1)))) && operand_equal_p (arg0, TREE_OPERAND (arg1, 0), 0)) return omit_one_operand_loc (loc, type, integer_zero_node, arg0); @@ -10933,6 +10939,14 @@ fold_binary_loc (location_t loc, build_int_cst (TREE_TYPE (tem), 1)), build_int_cst (TREE_TYPE (tem), 0)); } + /* Fold !X & 1 as X == 0. */ + if (TREE_CODE (arg0) == TRUTH_NOT_EXPR + && integer_onep (arg1)) + { + tem = TREE_OPERAND (arg0, 0); + return fold_build2_loc (loc, EQ_EXPR, type, tem, + build_int_cst (TREE_TYPE (tem), 0)); + } /* Fold (X ^ Y) & Y as ~X & Y. */ if (TREE_CODE (arg0) == BIT_XOR_EXPR diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7868b7b8e84..3aa6446ab6b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2011-06-20 Kai Tietz + + * gcc.dg/binop-notand1.c: New test. + * gcc.dg/binop-notand2.c: New test. + * gcc.dg/binop-notand3.c: New test. + * gcc.dg/binop-notand4.c: New test. + * gcc.dg/binop-notand5.c: New test. + * gcc.dg/binop-notand6.c: New test. + 2011-06-18 Jakub Jelinek PR testsuite/49432 diff --git a/gcc/testsuite/gcc.dg/binop-notand1.c b/gcc/testsuite/gcc.dg/binop-notand1.c new file mode 100644 index 00000000000..cadf7e532c5 --- /dev/null +++ b/gcc/testsuite/gcc.dg/binop-notand1.c @@ -0,0 +1,11 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-optimized" } */ + +int +foo (int a, int b) +{ + return (a & !a) | (b & !b); +} + +/* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" } } */ +/* { dg-final { cleanup-tree-dump "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/binop-notand2.c b/gcc/testsuite/gcc.dg/binop-notand2.c new file mode 100644 index 00000000000..0076d4be7a1 --- /dev/null +++ b/gcc/testsuite/gcc.dg/binop-notand2.c @@ -0,0 +1,11 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-optimized" } */ + +int +foo (int a) +{ + return (!a & 1) != (a == 0); +} + +/* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" } } */ +/* { dg-final { cleanup-tree-dump "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/binop-notand3.c b/gcc/testsuite/gcc.dg/binop-notand3.c new file mode 100644 index 00000000000..5f8e32ff8fa --- /dev/null +++ b/gcc/testsuite/gcc.dg/binop-notand3.c @@ -0,0 +1,11 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-optimized" } */ + +int +foo (int a) +{ + return (!a & 1) != ((a == 0) & 1); +} + +/* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" } } */ +/* { dg-final { cleanup-tree-dump "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/binop-notand4.c b/gcc/testsuite/gcc.dg/binop-notand4.c new file mode 100644 index 00000000000..1c3fefd61e9 --- /dev/null +++ b/gcc/testsuite/gcc.dg/binop-notand4.c @@ -0,0 +1,11 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-optimized" } */ + +int +foo (int a, int b) +{ + return (!a & a) | (b & !b); +} + +/* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" } } */ +/* { dg-final { cleanup-tree-dump "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/binop-notand5.c b/gcc/testsuite/gcc.dg/binop-notand5.c new file mode 100644 index 00000000000..463f19b04da --- /dev/null +++ b/gcc/testsuite/gcc.dg/binop-notand5.c @@ -0,0 +1,11 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-optimized" } */ + +int +foo (int a, int b) +{ + return (a & (a == 0)) | (b & !b); +} + +/* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" } } */ +/* { dg-final { cleanup-tree-dump "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/binop-notand6.c b/gcc/testsuite/gcc.dg/binop-notand6.c new file mode 100644 index 00000000000..e1882aca679 --- /dev/null +++ b/gcc/testsuite/gcc.dg/binop-notand6.c @@ -0,0 +1,11 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-optimized" } */ + +int +foo (int a, int b) +{ + return (a & !a) | (b & (b == 0)); +} + +/* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" } } */ +/* { dg-final { cleanup-tree-dump "optimized" } } */ -- 2.30.2