From f0e98f1bb47ab5827d89bd6a16f4263e20549da3 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Tue, 4 Dec 2018 11:26:14 +0000 Subject: [PATCH] re PR tree-optimization/88301 (Optimization regression with undefined unsigned overflow) 2018-12-04 Richard Biener PR tree-optimization/88301 * tree-vrp.c (register_edge_assert_for_2): Fix sign-conversion issues in last commit. From-SVN: r266773 --- gcc/ChangeLog | 6 ++++++ gcc/tree-vrp.c | 15 +++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 335caf63854..4bb7187ceb2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2018-12-04 Richard Biener + + PR tree-optimization/88301 + * tree-vrp.c (register_edge_assert_for_2): Fix sign-conversion + issues in last commit. + 2018-12-04 Richard Biener PR tree-optimization/88315 diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c index b00eca87c82..6fd1fd26eef 100644 --- a/gcc/tree-vrp.c +++ b/gcc/tree-vrp.c @@ -2973,6 +2973,21 @@ register_edge_assert_for_2 (tree name, edge e, wide_int rmin, rmax; tree rhs1 = gimple_assign_rhs1 (def_stmt); if (INTEGRAL_TYPE_P (TREE_TYPE (rhs1)) + /* Make sure the relation preserves the upper/lower boundary of + the range conservatively. */ + && (comp_code == NE_EXPR + || comp_code == EQ_EXPR + || (TYPE_SIGN (TREE_TYPE (name)) + == TYPE_SIGN (TREE_TYPE (rhs1))) + || ((comp_code == LE_EXPR + || comp_code == LT_EXPR) + && !TYPE_UNSIGNED (TREE_TYPE (rhs1))) + || ((comp_code == GE_EXPR + || comp_code == GT_EXPR) + && TYPE_UNSIGNED (TREE_TYPE (rhs1)))) + /* And the conversion does not alter the value we compare + against and all values in rhs1 can be represented in + the converted to type. */ && int_fits_type_p (val, TREE_TYPE (rhs1)) && ((TYPE_PRECISION (TREE_TYPE (name)) > TYPE_PRECISION (TREE_TYPE (rhs1))) -- 2.30.2