From 476a31b55b5471262b567bb00fe8f9f04417a11e Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Mon, 3 Dec 2018 13:38:20 +0000 Subject: [PATCH] re PR tree-optimization/88301 (Optimization regression with undefined unsigned overflow) 2018-12-03 Richard Biener PR tree-optimization/88301 * tree-vrp.c (register_edge_assert_for_2): Handle conversions that do not change the value by registering the same assert for the operand. * gcc.dg/tree-ssa/evrp13.c: New testcase. From-SVN: r266739 --- gcc/ChangeLog | 7 +++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/tree-ssa/evrp13.c | 7 +++++++ gcc/tree-vrp.c | 17 +++++++++++++++++ 4 files changed, 36 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/evrp13.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9f00aff51d9..626e70239e3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2018-12-03 Richard Biener + + PR tree-optimization/88301 + * tree-vrp.c (register_edge_assert_for_2): Handle conversions + that do not change the value by registering the same assert + for the operand. + 2018-12-03 Richard Biener * tree-vect-loop.c (vect_transform_loop): Properly compute diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2032b88ab67..f38b209ff07 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-12-03 Richard Biener + + PR tree-optimization/88301 + * gcc.dg/tree-ssa/evrp13.c: New testcase. + 2018-12-03 Jakub Jelinek PR tree-optimization/71109 diff --git a/gcc/testsuite/gcc.dg/tree-ssa/evrp13.c b/gcc/testsuite/gcc.dg/tree-ssa/evrp13.c new file mode 100644 index 00000000000..cfa4e8256c0 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/evrp13.c @@ -0,0 +1,7 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-evrp" } */ + +#define ADD_NW(A,B) (__extension__({ __typeof(A+B) R; if(__builtin_add_overflow(A,B,&R)) __builtin_unreachable(); R ;})) +_Bool a_b2(unsigned A, unsigned B) { return ADD_NW(A,B) >= B; } + +/* { dg-final { scan-tree-dump "return 1;" "evrp" } } */ diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c index aa6309e9e7b..b00eca87c82 100644 --- a/gcc/tree-vrp.c +++ b/gcc/tree-vrp.c @@ -2966,6 +2966,23 @@ register_edge_assert_for_2 (tree name, edge e, add_assert_info (asserts, name2, tmp, new_comp_code, new_val); } + /* If we have a conversion that doesn't change the value of the source + simply register the same assert for it. */ + if (CONVERT_EXPR_CODE_P (rhs_code)) + { + wide_int rmin, rmax; + tree rhs1 = gimple_assign_rhs1 (def_stmt); + if (INTEGRAL_TYPE_P (TREE_TYPE (rhs1)) + && int_fits_type_p (val, TREE_TYPE (rhs1)) + && ((TYPE_PRECISION (TREE_TYPE (name)) + > TYPE_PRECISION (TREE_TYPE (rhs1))) + || (get_range_info (rhs1, &rmin, &rmax) == VR_RANGE + && wi::fits_to_tree_p (rmin, TREE_TYPE (name)) + && wi::fits_to_tree_p (rmax, TREE_TYPE (name))))) + add_assert_info (asserts, rhs1, rhs1, + comp_code, fold_convert (TREE_TYPE (rhs1), val)); + } + /* Add asserts for NAME cmp CST and NAME being defined as NAME = NAME2 & CST2. -- 2.30.2