Merge with trunk.

[thirdparty/gcc.git] / gcc / graphite-sese-to-poly.c

diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c
index 514be1d3847204a1b360bc89eb3039d9eda516ed..342cf7b1189d8f307e299e6702699d94600fc5ea 100644 (file)
--- a/gcc/graphite-sese-to-poly.c
+++ b/gcc/graphite-sese-to-poly.c
@@ -63,8 +63,7 @@ along with GCC; see the file COPYING3.  If not see
 static inline void
 tree_int_to_gmp (tree t, mpz_t res)
 {
-  double_int di = tree_to_double_int (t);
-  mpz_set_double_int (res, di, TYPE_UNSIGNED (TREE_TYPE (t)));
+  wi::to_mpz (t, res, TYPE_SIGN (TREE_TYPE (t)));
 }
 
 /* Returns the index of the PHI argument defined in the outermost
@@ -1015,7 +1014,7 @@ build_loop_iteration_domains (scop_p scop, struct loop *loop,
   /* loop_i <= expr_nb_iters */
   else if (!chrec_contains_undetermined (nb_iters))
     {
-      double_int nit;
+      widest_int nit;
       isl_pw_aff *aff;
       isl_set *valid;
       isl_local_space *ls;
@@ -1051,7 +1050,7 @@ build_loop_iteration_domains (scop_p scop, struct loop *loop,
          isl_constraint *c;
 
          mpz_init (g);
-         mpz_set_double_int (g, nit, false);
+         wi::to_mpz (nit, g, SIGNED);
          mpz_sub_ui (g, g, 1);
          approx = extract_affine_gmp (g, isl_set_get_space (inner));
          x = isl_pw_aff_ge_set (approx, aff);
@@ -1505,9 +1504,9 @@ pdr_add_data_dimensions (isl_set *extent, scop_p scop, data_reference_p dr)
          subscript - low >= 0 and high - subscript >= 0 in case one of
         the two bounds isn't known.  Do the same here?  */
 
-      if (host_integerp (low, 0)
+      if (tree_fits_shwi_p (low)
          && high
-         && host_integerp (high, 0)
+         && tree_fits_shwi_p (high)
          /* 1-element arrays at end of structures may extend over
             their declared size.  */
          && !(array_at_struct_end_p (ref)