From 9f8139900d3b6be84b303ad505cf5899e95d8ea2 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Tue, 2 Aug 2011 20:26:57 +0000 Subject: [PATCH] re PR bootstrap/49914 (call to abs(long long) in gcc/fold-const.c) 2011-08-02 Paolo Carlini PR bootstrap/49914 * fold-const.c (fold_plusminus_mult_expr): Use abs_hwi instead of abs. * tree-ssa-math-opts.c (gimple_expand_builtin_pow): Likewise. * tree-ssa-loop-prefetch.c (prune_ref_by_group_reuse): Likewise. From-SVN: r177212 --- gcc/ChangeLog | 8 ++++++++ gcc/fold-const.c | 5 ++--- gcc/tree-ssa-loop-prefetch.c | 5 +++-- gcc/tree-ssa-math-opts.c | 15 ++++++++------- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6745886dc55..a843f8dd69e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2011-08-02 Paolo Carlini + + PR bootstrap/49914 + * fold-const.c (fold_plusminus_mult_expr): Use abs_hwi instead + of abs. + * tree-ssa-math-opts.c (gimple_expand_builtin_pow): Likewise. + * tree-ssa-loop-prefetch.c (prune_ref_by_group_reuse): Likewise. + 2011-08-02 Richard Henderson * config/h8300/h8300.c (push, pop): Return the insn. diff --git a/gcc/fold-const.c b/gcc/fold-const.c index 736b5cafa50..8ad806f9eee 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -7037,8 +7037,7 @@ fold_plusminus_mult_expr (location_t loc, enum tree_code code, tree type, int11 = TREE_INT_CST_LOW (arg11); /* Move min of absolute values to int11. */ - if ((int01 >= 0 ? int01 : -int01) - < (int11 >= 0 ? int11 : -int11)) + if (abs_hwi (int01) < abs_hwi (int11)) { tmp = int01, int01 = int11, int11 = tmp; alt0 = arg00, arg00 = arg10, arg10 = alt0; @@ -7048,7 +7047,7 @@ fold_plusminus_mult_expr (location_t loc, enum tree_code code, tree type, else maybe_same = arg11; - if (exact_log2 (abs (int11)) > 0 && int01 % int11 == 0 + if (exact_log2 (abs_hwi (int11)) > 0 && int01 % int11 == 0 /* The remainder should not be a constant, otherwise we end up folding i * 4 + 2 to (i * 2 + 1) * 2 which has increased the number of multiplications necessary. */ diff --git a/gcc/tree-ssa-loop-prefetch.c b/gcc/tree-ssa-loop-prefetch.c index 88f95ef3d97..82634cce078 100644 --- a/gcc/tree-ssa-loop-prefetch.c +++ b/gcc/tree-ssa-loop-prefetch.c @@ -1,5 +1,6 @@ /* Array prefetching. - Copyright (C) 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 2008, 2009, 2010, 2011 + Free Software Foundation, Inc. This file is part of GCC. @@ -794,7 +795,7 @@ prune_ref_by_group_reuse (struct mem_ref *ref, struct mem_ref *by, prefetch_before = (hit_from - delta_r + step - 1) / step; /* Do not reduce prefetch_before if we meet beyond cache size. */ - if (prefetch_before > (unsigned) abs (L2_CACHE_SIZE_BYTES / step)) + if (prefetch_before > (unsigned) abs_hwi (L2_CACHE_SIZE_BYTES / step)) prefetch_before = PREFETCH_ALL; if (prefetch_before < ref->prefetch_before) ref->prefetch_before = prefetch_before; diff --git a/gcc/tree-ssa-math-opts.c b/gcc/tree-ssa-math-opts.c index 49ec360f9ce..63cc175eadd 100644 --- a/gcc/tree-ssa-math-opts.c +++ b/gcc/tree-ssa-math-opts.c @@ -1231,9 +1231,10 @@ gimple_expand_builtin_pow (gimple_stmt_iterator *gsi, location_t loc, /* Attempt to fold powi(arg0, abs(n/2)) into multiplies. If not possible or profitable, give up. Skip the degenerate case when n is 1 or -1, where the result is always 1. */ - if (abs (n) != 1) + if (abs_hwi (n) != 1) { - powi_x_ndiv2 = gimple_expand_builtin_powi (gsi, loc, arg0, abs(n/2)); + powi_x_ndiv2 = gimple_expand_builtin_powi (gsi, loc, arg0, + abs_hwi (n / 2)); if (!powi_x_ndiv2) return NULL_TREE; } @@ -1242,7 +1243,7 @@ gimple_expand_builtin_pow (gimple_stmt_iterator *gsi, location_t loc, result of the optimal multiply sequence just calculated. */ sqrt_arg0 = build_and_insert_call (gsi, loc, &target, sqrtfn, arg0); - if (abs (n) == 1) + if (abs_hwi (n) == 1) result = sqrt_arg0; else result = build_and_insert_binop (gsi, loc, target, MULT_EXPR, @@ -1284,10 +1285,10 @@ gimple_expand_builtin_pow (gimple_stmt_iterator *gsi, location_t loc, /* Attempt to fold powi(arg0, abs(n/3)) into multiplies. If not possible or profitable, give up. Skip the degenerate case when abs(n) < 3, where the result is always 1. */ - if (abs (n) >= 3) + if (abs_hwi (n) >= 3) { powi_x_ndiv3 = gimple_expand_builtin_powi (gsi, loc, arg0, - abs (n / 3)); + abs_hwi (n / 3)); if (!powi_x_ndiv3) return NULL_TREE; } @@ -1297,14 +1298,14 @@ gimple_expand_builtin_pow (gimple_stmt_iterator *gsi, location_t loc, either cbrt(x) or cbrt(x) * cbrt(x). */ cbrt_x = build_and_insert_call (gsi, loc, &target, cbrtfn, arg0); - if (abs (n) % 3 == 1) + if (abs_hwi (n) % 3 == 1) powi_cbrt_x = cbrt_x; else powi_cbrt_x = build_and_insert_binop (gsi, loc, target, MULT_EXPR, cbrt_x, cbrt_x); /* Multiply the two subexpressions, unless powi(x,abs(n)/3) = 1. */ - if (abs (n) < 3) + if (abs_hwi (n) < 3) result = powi_cbrt_x; else result = build_and_insert_binop (gsi, loc, target, MULT_EXPR,