Handle host_integerp references that weren't caught by the sed. Thanks, Richard
gcc/ada/ * gcc-interface/cuintp.c: Update comments to refer to tree_fits_shwi_p rather than host_integerp. * gcc-interface/decl.c (gnat_to_gnu_entity): Use tree_fits_uhwi_p rather than host_integerp. * gcc-interface/utils.c (rest_of_record_type_compilation): Likewise. gcc/ * expr.h: Update comments to refer to tree_fits_[su]hwi_p rather than host_integerp. Index: gcc/ada/gcc-interface/cuintp.c =================================================================== --- gcc/ada/gcc-interface/cuintp.c 2013-11-16 09:14:25.293995960 +0000 +++ gcc/ada/gcc-interface/cuintp.c 2013-11-16 09:33:31.591920981 +0000 @@ -150,7 +150,7 @@ UI_From_gnu (tree Input) Int_Vector vec; #if HOST_BITS_PER_WIDE_INT == 64 - /* On 64-bit hosts, host_integerp tells whether the input fits in a + /* On 64-bit hosts, tree_fits_shwi_p tells whether the input fits in a signed 64-bit integer. Then a truncation tells whether it fits in a signed 32-bit integer. */ if (tree_fits_shwi_p (Input)) @@ -162,7 +162,7 @@ UI_From_gnu (tree Input) else return No_Uint; #else - /* On 32-bit hosts, host_integerp tells whether the input fits in a + /* On 32-bit hosts, tree_fits_shwi_p tells whether the input fits in a signed 32-bit integer. Then a sign test tells whether it fits in a signed 64-bit integer. */ if (tree_fits_shwi_p (Input)) Index: gcc/ada/gcc-interface/decl.c =================================================================== --- gcc/ada/gcc-interface/decl.c 2013-11-16 09:22:06.982466042 +0000 +++ gcc/ada/gcc-interface/decl.c 2013-11-16 09:33:31.614921192 +0000 @@ -1480,8 +1480,8 @@ gnat_to_gnu_entity (Entity_Id gnat_entit && AGGREGATE_TYPE_P (gnu_type) && tree_fits_uhwi_p (TYPE_SIZE_UNIT (gnu_type)) && !(TYPE_IS_PADDING_P (gnu_type) - && !host_integerp (TYPE_SIZE_UNIT - (TREE_TYPE (TYPE_FIELDS (gnu_type))), 1))) + && !tree_fits_uhwi_p (TYPE_SIZE_UNIT + (TREE_TYPE (TYPE_FIELDS (gnu_type)))))) static_p = true; /* Now create the variable or the constant and set various flags. */ Index: gcc/ada/gcc-interface/utils.c =================================================================== --- gcc/ada/gcc-interface/utils.c 2013-11-16 09:22:06.985466064 +0000 +++ gcc/ada/gcc-interface/utils.c 2013-11-16 09:33:31.616921211 +0000 @@ -1753,8 +1753,8 @@ rest_of_record_type_compilation (tree re && TREE_CODE (curpos) == PLUS_EXPR && tree_fits_uhwi_p (TREE_OPERAND (curpos, 1)) && TREE_CODE (TREE_OPERAND (curpos, 0)) == MULT_EXPR - && host_integerp - (TREE_OPERAND (TREE_OPERAND (curpos, 0), 1), 1)) + && tree_fits_uhwi_p + (TREE_OPERAND (TREE_OPERAND (curpos, 0), 1))) { tree offset = TREE_OPERAND (TREE_OPERAND (curpos, 0), 0); unsigned HOST_WIDE_INT addend Index: gcc/expr.h =================================================================== --- gcc/expr.h 2013-11-16 09:14:25.398996758 +0000 +++ gcc/expr.h 2013-11-16 09:33:31.719922154 +0000 @@ -26,7 +26,7 @@ #define GCC_EXPR_H #include "rtl.h" /* For optimize_size */ #include "flags.h" -/* For host_integerp, tree_low_cst, fold_convert, size_binop, ssize_int, +/* For tree_fits_[su]hwi_p, tree_low_cst, fold_convert, size_binop, ssize_int, TREE_CODE, TYPE_SIZE, int_size_in_bytes, */ #include "tree-core.h" /* For GET_MODE_BITSIZE, word_mode */