From: Andrew Pinski Date: Wed, 4 May 2005 01:52:06 +0000 (+0000) Subject: [multiple changes] X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a7e1c9287c7fadf9e58521833f846fdb680bd81c;p=gcc.git [multiple changes] 2004-05-03 Andrew Pinski PR middle-end/15618 * fold-const.c (fold_widened_comparison): Treat BOOLEAN_TYPE the same as INTEGER_TYPE. (fold_binary): Fold "bool_var != 0" to bool_var. Fold "bool_var == 1" to bool_var. 2005-05-03 Andrew Pinski PR middle-end/15618 * gcc.dg/tree-ssa/bool-[1-9].c: New tests. From-SVN: r99207 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0ed63877471..d2177e0f64b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2004-05-03 Andrew Pinski + + PR middle-end/15618 + * fold-const.c (fold_widened_comparison): Treat BOOLEAN_TYPE + the same as INTEGER_TYPE. + (fold_binary): Fold "bool_var != 0" to bool_var. + Fold "bool_var == 1" to bool_var. + 2004-05-03 Richard Henderson PR middle-end/21318 diff --git a/gcc/fold-const.c b/gcc/fold-const.c index 9e9243cdaae..140f940af27 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -6149,7 +6149,8 @@ fold_widened_comparison (enum tree_code code, tree type, tree arg0, tree arg1) || TYPE_UNSIGNED (TREE_TYPE (arg0)) == TYPE_UNSIGNED (shorter_type)) && (TREE_TYPE (arg1_unw) == shorter_type || (TREE_CODE (arg1_unw) == INTEGER_CST - && TREE_CODE (shorter_type) == INTEGER_TYPE + && (TREE_CODE (shorter_type) == INTEGER_TYPE + || TREE_CODE (shorter_type) == BOOLEAN_TYPE) && int_fits_type_p (arg1_unw, shorter_type)))) return fold_build2 (code, type, arg0_unw, fold_convert (shorter_type, arg1_unw)); @@ -8856,10 +8857,20 @@ fold_binary (enum tree_code code, tree type, tree op0, tree op1) case LT_EXPR: case GT_EXPR: case LE_EXPR: - case GE_EXPR: + case GE_EXPR: /* If one arg is a real or integer constant, put it last. */ if (tree_swap_operands_p (arg0, arg1, true)) return fold_build2 (swap_tree_comparison (code), type, op1, op0); + + /* bool_var != 0 becomes bool_var. */ + if (TREE_CODE (TREE_TYPE (arg0)) == BOOLEAN_TYPE && integer_zerop (arg1) + && code == NE_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 == EQ_EXPR) + return non_lvalue (fold_convert (type, arg0)); /* If this is an equality comparison of the address of a non-weak object against zero, then we know the result. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8638f985281..dca68964903 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-05-03 Andrew Pinski + + PR middle-end/15618 + * gcc.dg/tree-ssa/bool-[1-9].c: New tests. + 2005-05-04 Jakub Jelinek PR middle-end/21265 diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bool-1.c b/gcc/testsuite/gcc.dg/tree-ssa/bool-1.c new file mode 100644 index 00000000000..90cdef90c4e --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-1.c @@ -0,0 +1,19 @@ +/* { dg-do compile } */ +/* { dg-options "-O1 -fdump-tree-optimized" } */ + +int f(_Bool x) +{ + if (x != 0) + return 1; + return 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"} } */ + +/* There should be no adde for powerpc. Checking if we actually optimizated + away the comparision. */ +/* { dg-final { scan-assembler-times "adde" 0 { target powerpc-*-* } } } */ + +/* { dg-final { cleanup-tree-dump "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bool-2.c b/gcc/testsuite/gcc.dg/tree-ssa/bool-2.c new file mode 100644 index 00000000000..e46189ad9f2 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-2.c @@ -0,0 +1,22 @@ +/* { dg-do compile } */ +/* { dg-options "-O1 -fdump-tree-optimized" } */ + +int f(_Bool x) +{ + int y; + if (x) + y = 1; + else + y = 0; + return y; +} + +/* 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"} } */ + +/* There should be no adde for powerpc. Checking if we actually optimizated + away the comparision. */ +/* { dg-final { scan-assembler-times "adde" 0 { target powerpc-*-* } } } */ + +/* { dg-final { cleanup-tree-dump "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bool-3.c b/gcc/testsuite/gcc.dg/tree-ssa/bool-3.c new file mode 100644 index 00000000000..f2ee9b864dd --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-3.c @@ -0,0 +1,18 @@ +/* { dg-do compile } */ +/* { dg-options "-O1 -fdump-tree-optimized" } */ + +int f(_Bool x) +{ + int y; + if (!x) + y = 0; + else + y = 1; + return y; +} + +/* There should be no == 0. Though PHI-OPT or invert_truth does not + fold its tree. */ +/* { dg-final { scan-tree-dump-times "== 0" 0 "optimized" { xfail *-*-* } } } */ + +/* { dg-final { cleanup-tree-dump "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bool-4.c b/gcc/testsuite/gcc.dg/tree-ssa/bool-4.c new file mode 100644 index 00000000000..389124f0ede --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-4.c @@ -0,0 +1,17 @@ +/* { 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"} } */ + +/* There should be no adde for powerpc. Checking if we actually optimizated + away the comparision. */ +/* { dg-final { scan-assembler-times "adde" 0 { target powerpc-*-* } } } */ + +/* { dg-final { cleanup-tree-dump "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bool-5.c b/gcc/testsuite/gcc.dg/tree-ssa/bool-5.c new file mode 100644 index 00000000000..1cb9de2ceda --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-5.c @@ -0,0 +1,19 @@ +/* { dg-do compile } */ +/* { dg-options "-O1 -fdump-tree-optimized" } */ + +int f(_Bool x) +{ + if (x == 1) + return 1; + return 0; +} + +/* 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"} } */ + +/* There should be no adde for powerpc. Checking if we actually optimizated + away the comparision. */ +/* { dg-final { scan-assembler-times "adde" 0 { target powerpc-*-* } } } */ + +/* { dg-final { cleanup-tree-dump "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bool-6.c b/gcc/testsuite/gcc.dg/tree-ssa/bool-6.c new file mode 100644 index 00000000000..85f0333b826 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-6.c @@ -0,0 +1,22 @@ +/* { dg-do compile } */ +/* { dg-options "-O1 -fdump-tree-optimized" } */ + +int f(_Bool x) +{ + int y; + if (x) + y = 1; + else + y = 0; + return y; +} + +/* 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"} } */ + +/* There should be no adde for powerpc. Checking if we actually optimizated + away the comparision. */ +/* { dg-final { scan-assembler-times "adde" 0 { target powerpc-*-* } } } */ + +/* { 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 new file mode 100644 index 00000000000..b09b97202c5 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-7.c @@ -0,0 +1,18 @@ +/* { dg-do compile } */ +/* { dg-options "-O1 -fdump-tree-optimized" } */ + +int f(_Bool x) +{ + int y; + if (x != 1) + y = 0; + else + y = 1; + 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 *-*-* } } }*/ + +/* { dg-final { cleanup-tree-dump "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bool-8.c b/gcc/testsuite/gcc.dg/tree-ssa/bool-8.c new file mode 100644 index 00000000000..5a133097c38 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-8.c @@ -0,0 +1,17 @@ +/* { 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"} } */ + +/* There should be no adde for powerpc. Checking if we actually optimizated + away the comparision. */ +/* { dg-final { scan-assembler-times "adde" 0 { target powerpc-*-* } } } */ + +/* { dg-final { cleanup-tree-dump "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bool-9.c b/gcc/testsuite/gcc.dg/tree-ssa/bool-9.c new file mode 100644 index 00000000000..09df2e48983 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-9.c @@ -0,0 +1,17 @@ +/* { dg-do compile } */ +/* { dg-options "-O1 -fdump-tree-optimized" } */ + +_Bool f1(_Bool x) +{ + return !!x; +} + +/* 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"} } */ + +/* There should be no subfe for powerpc. Checking if we actually optimizated + away the comparision. */ +/* { dg-final { scan-assembler-times "subfe" 0 { target powerpc-*-* } } } */ + +/* { dg-final { cleanup-tree-dump "optimized" } } */