This reverts commit r270894, as new testcase fails on arm and aarch64, I am sorry...

From-SVN: r270910

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3e9b69be2f075cef449e373c1a75fa0635414853..766123752965c6cc16dd62204224de4396148dac 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -67,11 +67,6 @@
        and macros.
        * config/i386/t-i386: Define dependencies for new files.
 
-2019-05-06  Li Jia He  <helijia@linux.ibm.com>
-
-       * tree-ssa-phiopt.c (two_value_replacement): Fix a typo in parameter
-       detection.
-
 2019-05-03  Richard Earnshaw  <rearnsha@arm.com>
 
        PR target/89400

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 37887397d747267bf4366058e6f5b8e09660dc14..ec1ec51b8a3b2d6894e4d3214d947fb78d8fe5c7 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -21,12 +21,6 @@
        systems.
        * gcc.dg/tsan/pr88017.c: Likewise.
 
-2019-05-06  Li Jia He  <helijia@linux.ibm.com>
-
-       * gcc.dg/tree-ssa/pr37508.c: Add the no-ssa-phiopt option to skip phi
-       optimization.
-       * gcc.dg/tree-ssa/pr88676-2.c: New testcase.
-
 2019-05-05  Thomas Koenig <tkoenig@gcc.gnu.org>
 
        PR fortran/90344

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr37508.c b/gcc/testsuite/gcc.dg/tree-ssa/pr37508.c
index a6def045de40b725b5e44f2c0c6c6ed97e9c61c2..2ba09afe4819e622e34798dcbe935a184fe39e77 100644 (file)
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr37508.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr37508.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fno-ssa-phiopt -fno-tree-fre -fdump-tree-vrp1" } */
+/* { dg-options "-O2 -fno-tree-fre -fdump-tree-vrp1" } */
 
 struct foo1 {
   int i:1;
@@ -22,7 +22,7 @@ int test2 (struct foo2 *x)
 {
   if (x->i == 0)
     return 1;
-  else if (x->i == -1) /* This test is already optimized by ccp1 or phiopt1.  */
+  else if (x->i == -1) /* This test is already folded to false by ccp1.  */
     return 1;
   return 0;
 }
@@ -31,7 +31,7 @@ int test3 (struct foo1 *x)
 {
   if (x->i == 0)
     return 1;
-  else if (x->i == 1) /* This test is already optimized by ccp1 or phiopt1.  */
+  else if (x->i == 1) /* This test is already folded to false by fold.  */
     return 1;
   return 0;
 }

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr88676-2.c b/gcc/testsuite/gcc.dg/tree-ssa/pr88676-2.c
deleted file mode 100644 (file)
index a549a1e..0000000
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr88676-2.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* PR tree-optimization/88676 */
-/* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-phiopt1" } */
-/* { dg-final { scan-tree-dump-not " = PHI <" "optimized" } } */
-
-struct foo1 {
-  int i:1;
-};
-struct foo2 {
-  unsigned i:1;
-};
-
-int test1 (struct foo1 *x)
-{
-  if (x->i == 0)
-    return 1;
-  else if (x->i == 1)
-    return 1;
-  return 0;
-}
-
-int test2 (struct foo2 *x)
-{
-  if (x->i == 0)
-    return 1;
-  else if (x->i == -1)
-    return 1;
-  return 0;
-}
-

diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c
index 90674a2f3c49a852b208daf032b2934c343c45be..219791ea4ba57c234e96ead69dec3ea00d025ad5 100644 (file)
--- a/gcc/tree-ssa-phiopt.c
+++ b/gcc/tree-ssa-phiopt.c
@@ -602,7 +602,7 @@ two_value_replacement (basic_block cond_bb, basic_block middle_bb,
       || TREE_CODE (arg1) != INTEGER_CST
       || (tree_int_cst_lt (arg0, arg1)
          ? wi::to_widest (arg0) + 1 != wi::to_widest (arg1)
-         : wi::to_widest (arg1) + 1 != wi::to_widest (arg0)))
+         : wi::to_widest (arg1) + 1 != wi::to_widest (arg1)))
     return false;
 
   if (!empty_block_p (middle_bb))