From 959cef7434c0383f32ff28ab012fe17d9d94a7c2 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Thu, 21 Jul 2016 13:00:32 +0000 Subject: [PATCH] re PR tree-optimization/71947 (x ^ y not folded to 0 if x == y by DOM) 2016-07-21 Richard Biener PR tree-optimization/71947 * tree-vrp.c (extract_range_from_assert): Singleton symbolic ranges have useful limit_vr information. * gcc.dg/tree-ssa/vrp102.c: New testcase. From-SVN: r238591 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/tree-ssa/vrp102.c | 18 ++++++++++++++++++ gcc/tree-vrp.c | 11 +++++++---- 4 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/vrp102.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6c79b12354e..39b3690852a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2016-07-21 Richard Biener + + PR tree-optimization/71947 + * tree-vrp.c (extract_range_from_assert): Singleton symbolic + ranges have useful limit_vr information. + 2016-07-21 Richard Biener * function-tests.c (build_trivial_generic_function): Set diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 61b6fa90051..cb2f9e04103 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-07-21 Richard Biener + + PR tree-optimization/71947 + * gcc.dg/tree-ssa/vrp102.c: New testcase. + 2016-07-21 Bin Cheng * gcc.dg/tree-ssa/scev-15.c: New. diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp102.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp102.c new file mode 100644 index 00000000000..fb62e570bed --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp102.c @@ -0,0 +1,18 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fno-tree-dominator-opts -fdump-tree-vrp1" } */ + +int f(int x, int y) +{ + int ret; + if (x == y) + ret = x ^ y; + else + ret = 1; + + return ret; +} + +/* We should have computed x ^ y as zero and propagated the result into the + PHI feeding the result. */ + +/* { dg-final { scan-tree-dump "ret_\[0-9\]+ = PHI <\[01\]\\\(\[0-9\]+\\\), \[01\]\\\(\[0-9\]+\\\)>" "vrp1" } } */ diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c index b9ccb73ff79..06364b70f33 100644 --- a/gcc/tree-vrp.c +++ b/gcc/tree-vrp.c @@ -1513,10 +1513,13 @@ extract_range_from_assert (value_range *vr_p, tree expr) limit_vr = (TREE_CODE (limit) == SSA_NAME) ? get_value_range (limit) : NULL; /* LIMIT's range is only interesting if it has any useful information. */ - if (limit_vr - && (limit_vr->type == VR_UNDEFINED - || limit_vr->type == VR_VARYING - || symbolic_range_p (limit_vr))) + if (! limit_vr + || limit_vr->type == VR_UNDEFINED + || limit_vr->type == VR_VARYING + || (symbolic_range_p (limit_vr) + && ! (limit_vr->type == VR_RANGE + && (limit_vr->min == limit_vr->max + || operand_equal_p (limit_vr->min, limit_vr->max, 0))))) limit_vr = NULL; /* Initially, the new range has the same set of equivalences of -- 2.30.2