From 07eb93862b89cc356298b936ea2eb933c7a7a018 Mon Sep 17 00:00:00 2001 From: rguenth Date: Mon, 7 Apr 2014 14:03:55 +0000 Subject: [PATCH] 2014-04-07 Richard Biener PR tree-optimization/60766 * tree-ssa-loop-ivopts.c (cand_value_at): Compute in an unsigned type. (may_eliminate_iv): Convert cand_value_at result to desired type. * gcc.dg/torture/pr60766.c: New testcase. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@209190 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 8 ++++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/torture/pr60766.c | 15 +++++++++++++++ gcc/tree-ssa-loop-ivopts.c | 9 +++++++-- 4 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr60766.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d3cde1e..b7743c7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2014-04-07 Richard Biener + + PR tree-optimization/60766 + * tree-ssa-loop-ivopts.c (cand_value_at): Compute in an + unsigned type. + (may_eliminate_iv): Convert cand_value_at result to desired + type. + 2014-04-07 Jason Merrill PR c++/60731 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4b25290..a75405d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-04-07 Richard Biener + + PR tree-optimization/60766 + * gcc.dg/torture/pr60766.c: New testcase. + 2014-04-07 Jason Merrill * lib/gcc-dg.exp (dg-build-dso): New. diff --git a/gcc/testsuite/gcc.dg/torture/pr60766.c b/gcc/testsuite/gcc.dg/torture/pr60766.c new file mode 100644 index 0000000..6f16e3b --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr60766.c @@ -0,0 +1,15 @@ +/* { dg-do run } */ + +int m = 9; + +int main() +{ + int n, x; + + n = m; + for (x = 0; x <= n; x++) + if (n == x + (x + 1) + (x + 2)) + return 0; + + __builtin_abort(); +} diff --git a/gcc/tree-ssa-loop-ivopts.c b/gcc/tree-ssa-loop-ivopts.c index 14ba20f..8bc4e8f 100644 --- a/gcc/tree-ssa-loop-ivopts.c +++ b/gcc/tree-ssa-loop-ivopts.c @@ -4363,8 +4363,10 @@ cand_value_at (struct loop *loop, struct iv_cand *cand, gimple at, tree niter, tree steptype = type; if (POINTER_TYPE_P (type)) steptype = sizetype; + steptype = unsigned_type_for (type); - tree_to_aff_combination (iv->step, steptype, &step); + tree_to_aff_combination (iv->step, TREE_TYPE (iv->step), &step); + aff_combination_convert (&step, steptype); tree_to_aff_combination (niter, TREE_TYPE (niter), &nit); aff_combination_convert (&nit, steptype); aff_combination_mult (&nit, &step, &delta); @@ -4372,6 +4374,8 @@ cand_value_at (struct loop *loop, struct iv_cand *cand, gimple at, tree niter, aff_combination_add (&delta, &step); tree_to_aff_combination (iv->base, type, val); + if (!POINTER_TYPE_P (type)) + aff_combination_convert (val, steptype); aff_combination_add (val, &delta); } @@ -4750,7 +4754,8 @@ may_eliminate_iv (struct ivopts_data *data, cand_value_at (loop, cand, use->stmt, desc->niter, &bnd); - *bound = aff_combination_to_tree (&bnd); + *bound = fold_convert (TREE_TYPE (cand->iv->base), + aff_combination_to_tree (&bnd)); *comp = iv_elimination_compare (data, use); /* It is unlikely that computing the number of iterations using division -- 2.7.4