From b23b672e8d503ddd027a61807e3cc5ea9aaf2a4b Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Mon, 18 Nov 2013 14:52:42 +0000 Subject: [PATCH] tree.h (host_integerp, [...]): Delete. gcc/ * tree.h (host_integerp, tree_low_cst): Delete. * tree.c (host_integerp, tree_low_cst): Delete. From-SVN: r204963 --- gcc/ChangeLog | 5 +++++ gcc/tree.c | 31 ------------------------------- gcc/tree.h | 13 ------------- 3 files changed, 5 insertions(+), 44 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2c40489..6768fec 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2013-11-18 Richard Sandiford + * tree.h (host_integerp, tree_low_cst): Delete. + * tree.c (host_integerp, tree_low_cst): Delete. + +2013-11-18 Richard Sandiford + * expr.h: Update comments to refer to tree_to_[su]hwi rather than tree_low_cst. * fold-const.c (fold_binary_loc): Likewise. diff --git a/gcc/tree.c b/gcc/tree.c index f49f1fe..836db51 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -6970,26 +6970,6 @@ tree_int_cst_compare (const_tree t1, const_tree t2) return 0; } -/* Return 1 if T is an INTEGER_CST that can be manipulated efficiently on - the host. If POS is zero, the value can be represented in a single - HOST_WIDE_INT. If POS is nonzero, the value must be non-negative and can - be represented in a single unsigned HOST_WIDE_INT. */ - -int -host_integerp (const_tree t, int pos) -{ - if (t == NULL_TREE) - return 0; - - return (TREE_CODE (t) == INTEGER_CST - && ((TREE_INT_CST_HIGH (t) == 0 - && (HOST_WIDE_INT) TREE_INT_CST_LOW (t) >= 0) - || (! pos && TREE_INT_CST_HIGH (t) == -1 - && (HOST_WIDE_INT) TREE_INT_CST_LOW (t) < 0 - && !TYPE_UNSIGNED (TREE_TYPE (t))) - || (pos && TREE_INT_CST_HIGH (t) == 0))); -} - /* Return true if T is an INTEGER_CST whose numerical value (extended according to TYPE_UNSIGNED) fits in a signed HOST_WIDE_INT. */ @@ -7016,17 +6996,6 @@ tree_fits_uhwi_p (const_tree t) && TREE_INT_CST_HIGH (t) == 0); } -/* Return the HOST_WIDE_INT least significant bits of T if it is an - INTEGER_CST and there is no overflow. POS is nonzero if the result must - be non-negative. We must be able to satisfy the above conditions. */ - -HOST_WIDE_INT -tree_low_cst (const_tree t, int pos) -{ - gcc_assert (host_integerp (t, pos)); - return TREE_INT_CST_LOW (t); -} - /* T is an INTEGER_CST whose numerical value (extended according to TYPE_UNSIGNED) fits in a signed HOST_WIDE_INT. Return that HOST_WIDE_INT. */ diff --git a/gcc/tree.h b/gcc/tree.h index e61f6d4..2ac3480 100644 --- a/gcc/tree.h +++ b/gcc/tree.h @@ -3657,11 +3657,6 @@ extern int attribute_list_contained (const_tree, const_tree); extern int tree_int_cst_equal (const_tree, const_tree); extern int tree_int_cst_lt (const_tree, const_tree); extern int tree_int_cst_compare (const_tree, const_tree); -extern int host_integerp (const_tree, int) -#ifndef ENABLE_TREE_CHECKING - ATTRIBUTE_PURE /* host_integerp is pure only when checking is disabled. */ -#endif - ; extern bool tree_fits_shwi_p (const_tree) #ifndef ENABLE_TREE_CHECKING ATTRIBUTE_PURE /* tree_fits_shwi_p is pure only when checking is disabled. */ @@ -3672,18 +3667,10 @@ extern bool tree_fits_uhwi_p (const_tree) ATTRIBUTE_PURE /* tree_fits_uhwi_p is pure only when checking is disabled. */ #endif ; -extern HOST_WIDE_INT tree_low_cst (const_tree, int); extern HOST_WIDE_INT tree_to_shwi (const_tree); extern HOST_WIDE_INT tree_to_uhwi (const_tree); #if !defined ENABLE_TREE_CHECKING && (GCC_VERSION >= 4003) extern inline __attribute__ ((__gnu_inline__)) HOST_WIDE_INT -tree_low_cst (const_tree t, int pos) -{ - gcc_assert (host_integerp (t, pos)); - return TREE_INT_CST_LOW (t); -} - -extern inline __attribute__ ((__gnu_inline__)) HOST_WIDE_INT tree_to_shwi (const_tree t) { gcc_assert (tree_fits_shwi_p (t)); -- 2.7.4