From 8fde8b401da8b351f0ad3ed914e2b9cc9f3e9899 Mon Sep 17 00:00:00 2001 From: Christian Borntraeger Date: Tue, 25 May 2010 11:18:07 +0000 Subject: [PATCH] re PR middle-end/44203 (New prefetch test failures) 2010-05-25 Christian Borntraeger PR 44203 * tree-ssa-loop-prefetch.c: Fix logic for step calculation to match the original (and intended) behaviour before r159557. This changeset changed a=a+b*c to a=(a+b)*b which was obviously wrong in two ways. From-SVN: r159816 --- gcc/ChangeLog | 8 ++++++++ gcc/tree-ssa-loop-prefetch.c | 19 +++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3ac6da34154..8833cca25fc 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2010-05-25 Christian Borntraeger + + PR 44203 + * tree-ssa-loop-prefetch.c: Fix logic for step calculation to + match the original (and intended) behaviour before r159557. This + changeset changed a=a+b*c to a=(a+b)*b which was obviously wrong + in two ways. + 2010-05-25 Richard Guenther * doc/invoke.texi: Document -Ofast. diff --git a/gcc/tree-ssa-loop-prefetch.c b/gcc/tree-ssa-loop-prefetch.c index 633dd337c74..d63ede1bbe9 100644 --- a/gcc/tree-ssa-loop-prefetch.c +++ b/gcc/tree-ssa-loop-prefetch.c @@ -423,25 +423,24 @@ idx_analyze_ref (tree base, tree *index, void *data) ibase = build_int_cst (TREE_TYPE (ibase), 0); } - if (*ar_data->step == NULL_TREE) - *ar_data->step = step; - else - *ar_data->step = fold_build2 (PLUS_EXPR, sizetype, - fold_convert (sizetype, *ar_data->step), - fold_convert (sizetype, step)); if (TREE_CODE (base) == ARRAY_REF) { stepsize = array_ref_element_size (base); if (!cst_and_fits_in_hwi (stepsize)) return false; imult = int_cst_value (stepsize); - - *ar_data->step = fold_build2 (MULT_EXPR, sizetype, - fold_convert (sizetype, *ar_data->step), - fold_convert (sizetype, step)); + step = fold_build2 (MULT_EXPR, sizetype, + fold_convert (sizetype, step), + fold_convert (sizetype, stepsize)); idelta *= imult; } + if (*ar_data->step == NULL_TREE) + *ar_data->step = step; + else + *ar_data->step = fold_build2 (PLUS_EXPR, sizetype, + fold_convert (sizetype, *ar_data->step), + fold_convert (sizetype, step)); *ar_data->delta += idelta; *index = ibase;