From fe9acb3a7a7c448560abc9ab17558798ee1e5cad Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Tue, 14 Jul 2015 11:39:14 +0000 Subject: [PATCH] re PR tree-optimization/66863 (wrong code at -Os and above on x86_64-linux-gnu) 2015-07-14 Richard Biener PR tree-optimization/66863 * tree-vrp.c (register_edge_assert_for_2): Properly restrict what we record for conversion use stmt lhs inequalities. * gcc.dg/torture/pr66863.c: New testcase. From-SVN: r225768 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/torture/pr66863.c | 25 +++++++++++++++++++++++++ gcc/tree-vrp.c | 12 +++++++++++- 4 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr66863.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b3f695768dc..e9773897bc8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2015-07-14 Richard Biener + + PR tree-optimization/66863 + * tree-vrp.c (register_edge_assert_for_2): Properly restrict + what we record for conversion use stmt lhs inequalities. + 2015-07-14 Richard Biener * genmatch.c (dt_node::gen_kids_1): Fix case label indenting. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2e32e14527e..198775602a9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-07-14 Richard Biener + + PR tree-optimization/66863 + * gcc.dg/torture/pr66863.c: New testcase. + 2015-07-13 Patrick Palka PR c++/65186 diff --git a/gcc/testsuite/gcc.dg/torture/pr66863.c b/gcc/testsuite/gcc.dg/torture/pr66863.c new file mode 100644 index 00000000000..22cb397fc5d --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr66863.c @@ -0,0 +1,25 @@ +/* { dg-do run } */ + +int a, b; + +int +fn1 (int p1) +{ + if (p1 < -2147483647) + return 0; + else + return 1; +} + +int +fn2 (int p1, short p2) +{ + return p2 ? p1 % p2 : 0; +} + +int +main () +{ + b = fn2 (fn1 (a), a); + return 0; +} diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c index 8b2235c0fa8..795b02728ae 100644 --- a/gcc/tree-vrp.c +++ b/gcc/tree-vrp.c @@ -5381,7 +5381,17 @@ register_edge_assert_for_2 (tree name, edge e, gimple_stmt_iterator bsi, cst = int_const_binop (code, val, cst); } else if (CONVERT_EXPR_CODE_P (code)) - cst = fold_convert (TREE_TYPE (name2), val); + { + /* For truncating conversions require that the constant + fits in the truncated type if we are going to record + an inequality. */ + if (comp_code == NE_EXPR + && (TYPE_PRECISION (TREE_TYPE (name2)) + < TYPE_PRECISION (TREE_TYPE (name))) + && ! int_fits_type_p (val, TREE_TYPE (name2))) + continue; + cst = fold_convert (TREE_TYPE (name2), val); + } else continue; -- 2.30.2