Message ID | 87k3g8sd7f.fsf@talisman.default |
---|---|
State | New |
Headers | show |
On Sat, Nov 16, 2013 at 2:12 PM, Richard Sandiford <rdsandiford@googlemail.com> wrote: > Remove the old functions, which are now unused. Ok. Thanks, Richard. > Thanks, > Richard > > > gcc/ > * tree.h (host_integerp, tree_low_cst): Delete. > * tree.c (host_integerp, tree_low_cst): Delete. > > Index: gcc/tree.h > =================================================================== > --- gcc/tree.h 2013-11-16 09:35:59.381239766 +0000 > +++ gcc/tree.h 2013-11-16 10:14:00.618868694 +0000 > @@ -3654,11 +3654,6 @@ extern int attribute_list_contained (con > 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. */ > @@ -3669,18 +3664,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)); > Index: gcc/tree.c > =================================================================== > --- gcc/tree.c 2013-11-16 09:59:37.205620348 +0000 > +++ gcc/tree.c 2013-11-16 10:14:00.604868554 +0000 > @@ -6970,26 +6970,6 @@ tree_int_cst_compare (const_tree t1, con > 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. */
Index: gcc/tree.h =================================================================== --- gcc/tree.h 2013-11-16 09:35:59.381239766 +0000 +++ gcc/tree.h 2013-11-16 10:14:00.618868694 +0000 @@ -3654,11 +3654,6 @@ extern int attribute_list_contained (con 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. */ @@ -3669,18 +3664,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)); Index: gcc/tree.c =================================================================== --- gcc/tree.c 2013-11-16 09:59:37.205620348 +0000 +++ gcc/tree.c 2013-11-16 10:14:00.604868554 +0000 @@ -6970,26 +6970,6 @@ tree_int_cst_compare (const_tree t1, con 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. */