From 7934558dd1bb546c99903507337c94ba37dc68f3 Mon Sep 17 00:00:00 2001 From: Andrew Pinski Date: Fri, 25 Nov 2005 05:05:26 +0000 Subject: [PATCH] [multiple changes] 2005-11-25 Andrew Pinski PR middle-end/24989 * fold-const.c (fold_build): Convert bool_var != 1 and bool_var == 0 to !bool_var. 2005-11-24 Andrew Pinski PR middle-end/24989 * gcc.dg/tree-ssa/bool-10.c: New test. * gcc.dg/tree-ssa/bool-11.c: New test. * gcc.dg/tree-ssa/bool-7.c: Un-xfail. From-SVN: r107488 --- gcc/ChangeLog | 6 ++++++ gcc/fold-const.c | 10 ++++++++++ gcc/testsuite/ChangeLog | 7 +++++++ gcc/testsuite/gcc.dg/tree-ssa/bool-10.c | 14 ++++++++++++++ gcc/testsuite/gcc.dg/tree-ssa/bool-11.c | 14 ++++++++++++++ gcc/testsuite/gcc.dg/tree-ssa/bool-7.c | 5 ++--- 6 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/bool-10.c create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/bool-11.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index aeb45fdd654..bb928cfec4a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2005-11-25 Andrew Pinski + + PR middle-end/24989 + * fold-const.c (fold_build): Convert bool_var != 1 and + bool_var == 0 to !bool_var. + 2005-11-25 Andrew Pinski PR middle-end/24990 diff --git a/gcc/fold-const.c b/gcc/fold-const.c index 962ebd3c395..9a6ac70a39c 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -8857,6 +8857,16 @@ fold_binary (enum tree_code code, tree type, tree op0, tree op1) && code == EQ_EXPR) return non_lvalue (fold_convert (type, arg0)); + /* bool_var != 1 becomes !bool_var. */ + if (TREE_CODE (TREE_TYPE (arg0)) == BOOLEAN_TYPE && integer_onep (arg1) + && code == NE_EXPR) + return fold_build1 (TRUTH_NOT_EXPR, type, arg0); + + /* bool_var == 0 becomes !bool_var. */ + if (TREE_CODE (TREE_TYPE (arg0)) == BOOLEAN_TYPE && integer_zerop (arg1) + && code == EQ_EXPR) + return fold_build1 (TRUTH_NOT_EXPR, type, arg0); + /* If this is an equality comparison of the address of a non-weak object against zero, then we know the result. */ if ((code == EQ_EXPR || code == NE_EXPR) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index cb611dc1edc..226dc074f8d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2005-11-24 Andrew Pinski + + PR middle-end/24989 + * gcc.dg/tree-ssa/bool-10.c: New test. + * gcc.dg/tree-ssa/bool-11.c: New test. + * gcc.dg/tree-ssa/bool-7.c: Un-xfail. + 2005-11-24 Andrew Pinski PR middle-end/24990 diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bool-10.c b/gcc/testsuite/gcc.dg/tree-ssa/bool-10.c new file mode 100644 index 00000000000..d7bf20da81b --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-10.c @@ -0,0 +1,14 @@ +/* { dg-do compile } */ +/* { dg-options "-O1 -fdump-tree-optimized" } */ + +int f(_Bool x) +{ + return (x != 1); +} + +/* There should be no != 1 which is produced by the front-end as + bool_var != 1 is the same as !bool_var. */ +/* { dg-final { scan-tree-dump-times "!= 1" 0 "optimized"} } */ +/* { dg-final { scan-tree-dump-times "!x" 1 "optimized"} } */ + +/* { dg-final { cleanup-tree-dump "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bool-11.c b/gcc/testsuite/gcc.dg/tree-ssa/bool-11.c new file mode 100644 index 00000000000..8d88b7e87d5 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-11.c @@ -0,0 +1,14 @@ +/* { dg-do compile } */ +/* { dg-options "-O1 -fdump-tree-optimized" } */ + +int f(_Bool x) +{ + return (x == 0); +} + +/* There should be no == 0 which is produced by the front-end as + bool_var == 0 is the same as !bool_var. */ +/* { dg-final { scan-tree-dump-times "== 0" 0 "optimized"} } */ +/* { dg-final { scan-tree-dump-times "!x" 1 "optimized"} } */ + +/* { dg-final { cleanup-tree-dump "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bool-7.c b/gcc/testsuite/gcc.dg/tree-ssa/bool-7.c index b09b97202c5..b798710644a 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/bool-7.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-7.c @@ -11,8 +11,7 @@ int f(_Bool x) return y; } -/* There should be no != 1. Though PHI-OPT or invert_truth does not - fold its tree. */ -/* { dg-final { scan-tree-dump-times "!= 1" 0 "optimized" { xfail *-*-* } } }*/ +/* There should be no != 1. Fold changes x != 1 to ! x. */ +/* { dg-final { scan-tree-dump-times "!= 1" 0 "optimized" } } */ /* { dg-final { cleanup-tree-dump "optimized" } } */ -- 2.30.2