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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@204957 138bc75d-0d04-0410-961f-82ee72b054a4

6 files changed, 20 insertions, 7 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e91f89564cb..20504ae3b56 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2013-11-18  Richard Sandiford  <rdsandiford@googlemail.com>
 
+	* expr.h: Update comments to refer to tree_fits_[su]hwi_p rather
+	than host_integerp.
+
+2013-11-18  Richard Sandiford  <rdsandiford@googlemail.com>
+
 	* builtins.c, config/alpha/alpha.c, config/iq2000/iq2000.c,
 	config/mips/mips.c, dbxout.c, dwarf2out.c, expr.c, fold-const.c,
 	gimple-fold.c, godump.c, omp-low.c, predict.c, sdbout.c, stor-layout.c,
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 3b9af6edfac..de5b8812cf8 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,13 @@
 2013-11-18  Richard Sandiford  <rdsandiford@googlemail.com>
 
+	* 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.
+
+2013-11-18  Richard Sandiford  <rdsandiford@googlemail.com>
+
 	* gcc-interface/decl.c, gcc-interface/misc.c, gcc-interface/utils.c:
 	Replace host_integerp (..., 1) with tree_fits_uhwi_p throughout.
 
diff --git a/gcc/ada/gcc-interface/cuintp.c b/gcc/ada/gcc-interface/cuintp.c
index d3c19aed0e4..dee53164442 100644
--- a/gcc/ada/gcc-interface/cuintp.c
+++ b/gcc/ada/gcc-interface/cuintp.c
@@ -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))
diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c
index 3ad53c4120d..bbeb9a9fe5c 100644
--- a/gcc/ada/gcc-interface/decl.c
+++ b/gcc/ada/gcc-interface/decl.c
@@ -1484,8 +1484,8 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, int definition)
 	    && 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.  */
diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c
index 4588c52cf19..0e4099ce529 100644
--- a/gcc/ada/gcc-interface/utils.c
+++ b/gcc/ada/gcc-interface/utils.c
@@ -1753,8 +1753,8 @@ rest_of_record_type_compilation (tree record_type)
 		   && 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
diff --git a/gcc/expr.h b/gcc/expr.h
index 6dc71dce6ae..a0221f7e894 100644
--- a/gcc/expr.h
+++ b/gcc/expr.h
@@ -26,7 +26,7 @@ along with GCC; see the file COPYING3.  If not see
 #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 */