gcc/ada/

	* gcc-interface/cuintp.c (UI_From_gnu): Use tree_to_shwi rather than
	tree_low_cst.

gcc/c-family/
	* c-common.c (fold_offsetof_1): Use tree_to_uhwi rather than
	tree_low_cst.
	(complete_array_type): Update comment to refer to tree_to_[su]hwi
	rather than tree_low_cst.

gcc/c/
	* c-decl.c (grokdeclarator): Update comment to refer to
	tree_to_[su]hwi rather than tree_low_cst.

gcc/cp/
	* decl.c (reshape_init_array_1): Use tree_to_uhwi rather than
	tree_low_cst.
	(grokdeclarator): Update comment to refer to tree_to_[su]hwi rather
	than tree_low_cst.

gcc/
	* expr.h: Update comments to refer to tree_to_[su]hwi rather
	than tree_low_cst.
	* fold-const.c (fold_binary_loc): Likewise.
	* expr.c (store_constructor): Use tree_to_uhwi rather than
	tree_low_cst.
	* ipa-utils.h (possible_polymorphic_call_target_p): Likewise.
	* stmt.c (emit_case_dispatch_table): Likewise.
	* tree-switch-conversion.c (emit_case_bit_tests): Likewise.


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

15 files changed, 57 insertions, 26 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e9350e4c973..2c404891053 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,16 @@
 2013-11-18  Richard Sandiford  <rdsandiford@googlemail.com>
 
+	* expr.h: Update comments to refer to tree_to_[su]hwi rather
+	than tree_low_cst.
+	* fold-const.c (fold_binary_loc): Likewise.
+	* expr.c (store_constructor): Use tree_to_uhwi rather than
+	tree_low_cst.
+	* ipa-utils.h (possible_polymorphic_call_target_p): Likewise.
+	* stmt.c (emit_case_dispatch_table): Likewise.
+	* tree-switch-conversion.c (emit_case_bit_tests): Likewise.
+
+2013-11-18  Richard Sandiford  <rdsandiford@googlemail.com>
+
 	* alias.c, asan.c, builtins.c, cfgexpand.c, cgraph.c,
 	config/aarch64/aarch64.c, config/alpha/predicates.md,
 	config/arm/arm.c, config/darwin.c, config/epiphany/epiphany.c,
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 3f1bcfb43e1..a9fd65b16cd 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,10 @@
 2013-11-18  Richard Sandiford  <rdsandiford@googlemail.com>
 
+	* gcc-interface/cuintp.c (UI_From_gnu): Use tree_to_shwi rather than
+	tree_low_cst.
+
+2013-11-18  Richard Sandiford  <rdsandiford@googlemail.com>
+
 	* gcc-interface/decl.c, gcc-interface/utils.c, gcc-interface/utils2.c:
 	Replace tree_low_cst (..., 1) with tree_to_uhwi throughout.
 
diff --git a/gcc/ada/gcc-interface/cuintp.c b/gcc/ada/gcc-interface/cuintp.c
index dee53164442..473140daa2b 100644
--- a/gcc/ada/gcc-interface/cuintp.c
+++ b/gcc/ada/gcc-interface/cuintp.c
@@ -176,9 +176,9 @@ UI_From_gnu (tree Input)
 
   for (i = Max_For_Dint - 1; i >= 0; i--)
     {
-      v[i] = tree_low_cst (fold_build1 (ABS_EXPR, gnu_type,
+      v[i] = tree_to_shwi (fold_build1 (ABS_EXPR, gnu_type,
 					fold_build2 (TRUNC_MOD_EXPR, gnu_type,
-						     gnu_temp, gnu_base)), 0);
+						     gnu_temp, gnu_base)));
       gnu_temp = fold_build2 (TRUNC_DIV_EXPR, gnu_type, gnu_temp, gnu_base);
     }
 
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 3900b4de47b..8aac23c700a 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,5 +1,12 @@
 2013-11-18  Richard Sandiford  <rdsandiford@googlemail.com>
 
+	* c-common.c (fold_offsetof_1): Use tree_to_uhwi rather than
+	tree_low_cst.
+	(complete_array_type): Update comment to refer to tree_to_[su]hwi
+	rather than tree_low_cst.
+
+2013-11-18  Richard Sandiford  <rdsandiford@googlemail.com>
+
 	* c-common.c, c-cppbuiltin.c: Replace tree_low_cst (..., 1) with
 	tree_to_uhwi throughout.
 
diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index 7761494cbaa..fb8295dfdc5 100644
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -9721,8 +9721,7 @@ fold_offsetof_1 (tree expr)
 	  return error_mark_node;
 	}
       off = size_binop_loc (input_location, PLUS_EXPR, DECL_FIELD_OFFSET (t),
-			    size_int (tree_low_cst (DECL_FIELD_BIT_OFFSET (t),
-						    1)
+			    size_int (tree_to_uhwi (DECL_FIELD_BIT_OFFSET (t))
 				      / BITS_PER_UNIT));
       break;
 
@@ -10091,7 +10090,7 @@ complete_array_type (tree *ptype, tree initial_value, bool do_default)
     {
       error ("size of array is too large");
       /* If we proceed with the array type as it is, we'll eventually
-	 crash in tree_low_cst().  */
+	 crash in tree_to_[su]hwi().  */
       type = error_mark_node;
     }
 
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 65b40eec5ef..e8a5365592d 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,5 +1,10 @@
 2013-11-18  Richard Sandiford  <rdsandiford@googlemail.com>
 
+	* c-decl.c (grokdeclarator): Update comment to refer to
+	tree_to_[su]hwi rather than tree_low_cst.
+
+2013-11-18  Richard Sandiford  <rdsandiford@googlemail.com>
+
 	* c-decl.c, c-typeck.c: Replace tree_low_cst (..., 1) with
 	tree_to_uhwi throughout.
 
diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c
index 1f9c286708c..10933e80d1a 100644
--- a/gcc/c/c-decl.c
+++ b/gcc/c/c-decl.c
@@ -5912,7 +5912,7 @@ grokdeclarator (const struct c_declarator *declarator,
       else
 	error_at (loc, "size of unnamed array is too large");
       /* If we proceed with the array type as it is, we'll eventually
-	 crash in tree_low_cst().  */
+	 crash in tree_to_[su]hwi().  */
       type = error_mark_node;
     }
 
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e2705f9108e..2906ed7a63a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,12 @@
 2013-11-18  Richard Sandiford  <rdsandiford@googlemail.com>
 
+	* decl.c (reshape_init_array_1): Use tree_to_uhwi rather than
+	tree_low_cst.
+	(grokdeclarator): Update comment to refer to tree_to_[su]hwi rather
+	than tree_low_cst.
+
+2013-11-18  Richard Sandiford  <rdsandiford@googlemail.com>
+
 	* call.c, class.c, decl.c, error.c: Replace tree_low_cst (..., 1) with
 	tree_to_uhwi throughout.
 
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 1a1581e24c9..e2aad9d54b3 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -5097,8 +5097,7 @@ reshape_init_array_1 (tree elt_type, tree max_index, reshape_iter *d,
 	max_index_cst = tree_to_uhwi (max_index);
       /* sizetype is sign extended, not zero extended.  */
       else
-	max_index_cst = tree_low_cst (fold_convert (size_type_node, max_index),
-				      1);
+	max_index_cst = tree_to_uhwi (fold_convert (size_type_node, max_index));
     }
 
   /* Loop until there are no more initializers.  */
@@ -10033,7 +10032,7 @@ grokdeclarator (const cp_declarator *declarator,
     {
       error ("size of array %qs is too large", name);
       /* If we proceed with the array type as it is, we'll eventually
-	 crash in tree_low_cst().  */
+	 crash in tree_to_[su]hwi().  */
       type = error_mark_node;
     }
 
diff --git a/gcc/expr.c b/gcc/expr.c
index 4ce87119c2d..f4d03ab8026 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -6302,10 +6302,10 @@ store_constructor (tree exp, rtx target, int cleared, HOST_WIDE_INT size)
 
 	    FOR_EACH_CONSTRUCTOR_VALUE (CONSTRUCTOR_ELTS (exp), idx, value)
 	      {
-		int n_elts_here = tree_low_cst
+		int n_elts_here = tree_to_uhwi
 		  (int_const_binop (TRUNC_DIV_EXPR,
 				    TYPE_SIZE (TREE_TYPE (value)),
-				    TYPE_SIZE (elttype)), 1);
+				    TYPE_SIZE (elttype)));
 
 		count += n_elts_here;
 		if (mostly_zeros_p (value))
diff --git a/gcc/expr.h b/gcc/expr.h
index fd7a1d48dec..8230fd54bb1 100644
--- a/gcc/expr.h
+++ b/gcc/expr.h
@@ -26,8 +26,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "rtl.h"
 /* For optimize_size */
 #include "flags.h"
-/* For tree_fits_[su]hwi_p, tree_low_cst, fold_convert, size_binop, ssize_int,
-   TREE_CODE, TYPE_SIZE, int_size_in_bytes,    */
+/* For tree_fits_[su]hwi_p, tree_to_[su]hwi, fold_convert, size_binop,
+   ssize_int, TREE_CODE, TYPE_SIZE, int_size_in_bytes,    */
 #include "tree-core.h"
 /* For GET_MODE_BITSIZE, word_mode */
 #include "machmode.h"
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index f4997ba8330..22f64b3e48f 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -11904,7 +11904,7 @@ fold_binary_loc (location_t loc,
 		    if (TREE_CODE (TREE_OPERAND (pmop[which], 1))
 			!= INTEGER_CST)
 		      break;
-		    /* tree_low_cst not used, because we don't care about
+		    /* tree_to_[su]hwi not used, because we don't care about
 		       the upper bits.  */
 		    cst0 = TREE_INT_CST_LOW (TREE_OPERAND (pmop[which], 1));
 		    cst0 &= cst1;
diff --git a/gcc/ipa-utils.h b/gcc/ipa-utils.h
index cc72619348e..ca8b87290b5 100644
--- a/gcc/ipa-utils.h
+++ b/gcc/ipa-utils.h
@@ -117,8 +117,8 @@ possible_polymorphic_call_target_p (tree call,
 				    struct cgraph_node *n)
 {
   return possible_polymorphic_call_target_p (obj_type_ref_class (call),
-					     tree_low_cst
-						(OBJ_TYPE_REF_TOKEN (call), 1),
+					     tree_to_uhwi
+						(OBJ_TYPE_REF_TOKEN (call)),
 					     n);
 }
 #endif  /* GCC_IPA_UTILS_H  */
diff --git a/gcc/stmt.c b/gcc/stmt.c
index 04d9586697b..28fbf7a6bc1 100644
--- a/gcc/stmt.c
+++ b/gcc/stmt.c
@@ -1029,11 +1029,11 @@ emit_case_dispatch_table (tree index_expr, tree index_type,
 	 value since that should fit in a HOST_WIDE_INT while the
 	 actual values may not.  */
       HOST_WIDE_INT i_low
-	= tree_low_cst (fold_build2 (MINUS_EXPR, index_type,
-				     n->low, minval), 1);
+	= tree_to_uhwi (fold_build2 (MINUS_EXPR, index_type,
+				     n->low, minval));
       HOST_WIDE_INT i_high
-	= tree_low_cst (fold_build2 (MINUS_EXPR, index_type,
-				     n->high, minval), 1);
+	= tree_to_uhwi (fold_build2 (MINUS_EXPR, index_type,
+				     n->high, minval));
       HOST_WIDE_INT i;
 
       for (i = i_low; i <= i_high; i ++)
diff --git a/gcc/tree-switch-conversion.c b/gcc/tree-switch-conversion.c
index 40e50671a6d..a4340a49a8b 100644
--- a/gcc/tree-switch-conversion.c
+++ b/gcc/tree-switch-conversion.c
@@ -354,15 +354,13 @@ emit_case_bit_tests (gimple swtch, tree index_expr,
       else
         test[k].bits++;
 
-      lo = tree_low_cst (int_const_binop (MINUS_EXPR,
-					  CASE_LOW (cs), minval),
-			 1);
+      lo = tree_to_uhwi (int_const_binop (MINUS_EXPR,
+					  CASE_LOW (cs), minval));
       if (CASE_HIGH (cs) == NULL_TREE)
 	hi = lo;
       else
-	hi = tree_low_cst (int_const_binop (MINUS_EXPR, 
-					    CASE_HIGH (cs), minval),
-			   1);
+	hi = tree_to_uhwi (int_const_binop (MINUS_EXPR,
+					    CASE_HIGH (cs), minval));
 
       for (j = lo; j <= hi; j++)
         if (j >= HOST_BITS_PER_WIDE_INT)