Fix PR46758: Do not use int_cst_value.

2010-12-23  Sebastian Pop  <sebastian.pop@amd.com>
	    Richard Guenther  <rguenther@suse.de>

	PR tree-optimization/46758
	* graphite-sese-to-poly.c (scan_tree_for_params_right_scev): Use
	tree_int_to_gmp instead of int_cst_value.
	(scan_tree_for_params_int): Same.
	(scan_tree_for_params): Same.
	(pdr_add_data_dimensions): Use ppl_set_inhomogeneous_tree.

	* gcc.dg/graphite/run-id-pr46758.c: New.

Co-Authored-By: Richard Guenther <rguenther@suse.de>
From-SVN: r168214

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a436a6d92b27a3c91312e32797d25c74c19869c5..64afb5c7396cd76ed75652f34c2213c5b71b2836 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-23  Sebastian Pop  <sebastian.pop@amd.com>
+           Richard Guenther  <rguenther@suse.de>
+
+       PR tree-optimization/46758
+       * graphite-sese-to-poly.c (scan_tree_for_params_right_scev): Use
+       tree_int_to_gmp instead of int_cst_value.
+       (scan_tree_for_params_int): Same.
+       (scan_tree_for_params): Same.
+       (pdr_add_data_dimensions): Use ppl_set_inhomogeneous_tree.
+
 2010-12-23  Sebastian Pop  <sebastian.pop@amd.com>
 
        Backport from mainline

diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c
index fc284809ddd8dbb9256e724b9a1c2f1023b132d4..fe6aa7cfa75979b2d2e7e6fce52947fa0e5de3cc 100644 (file)
--- a/gcc/graphite-sese-to-poly.c
+++ b/gcc/graphite-sese-to-poly.c
@@ -715,7 +715,7 @@ scan_tree_for_params_right_scev (sese s, tree e, int var,
       gcc_assert (TREE_CODE (e) == INTEGER_CST);
 
       value_init (val);
-      value_set_si (val, int_cst_value (e));
+      tree_int_to_gmp (e, val);
       add_value_to_dim (l, expr, val);
       value_clear (val);
     }
@@ -729,16 +729,13 @@ scan_tree_for_params_int (tree cst, ppl_Linear_Expression_t expr, Value k)
 {
   Value val;
   ppl_Coefficient_t coef;
-  int v = int_cst_value (cst);
+  tree type = TREE_TYPE (cst);
 
   value_init (val);
-  value_set_si (val, 0);
 
   /* Necessary to not get "-1 = 2^n - 1". */
-  if (v < 0)
-    value_sub_int (val, val, -v);
-  else
-    value_add_int (val, val, v);
+  mpz_set_double_int (val, double_int_sext (tree_to_double_int (cst),
+                                           TYPE_PRECISION (type)), false);
 
   value_multiply (val, val, k);
   ppl_new_Coefficient (&coef);
@@ -816,7 +813,7 @@ scan_tree_for_params (sese s, tree e, ppl_Linear_Expression_t c,
              Value val;
              gcc_assert (host_integerp (TREE_OPERAND (e, 1), 0));
              value_init (val);
-             value_set_si (val, int_cst_value (TREE_OPERAND (e, 1)));
+             tree_int_to_gmp (TREE_OPERAND (e, 1), val);
              value_multiply (val, val, k);
              scan_tree_for_params (s, TREE_OPERAND (e, 0), c, val);
              value_clear (val);
@@ -831,7 +828,7 @@ scan_tree_for_params (sese s, tree e, ppl_Linear_Expression_t c,
              Value val;
              gcc_assert (host_integerp (TREE_OPERAND (e, 0), 0));
              value_init (val);
-             value_set_si (val, int_cst_value (TREE_OPERAND (e, 0)));
+             tree_int_to_gmp (TREE_OPERAND (e, 0), val);
              value_multiply (val, val, k);
              scan_tree_for_params (s, TREE_OPERAND (e, 1), c, val);
              value_clear (val);
@@ -1717,10 +1714,13 @@ pdr_add_data_dimensions (ppl_Polyhedron_t accesses, data_reference_p dr,
       /* subscript - low >= 0 */
       if (host_integerp (low, 0))
        {
+         tree minus_low;
+
          ppl_new_Linear_Expression_with_dimension (&expr, accessp_nb_dims);
          ppl_set_coef (expr, subscript, 1);
 
-         ppl_set_inhomogeneous (expr, -int_cst_value (low));
+         minus_low = fold_build1 (NEGATE_EXPR, TREE_TYPE (low), low);
+         ppl_set_inhomogeneous_tree (expr, minus_low);
 
          ppl_new_Constraint (&cstr, expr, PPL_CONSTRAINT_TYPE_GREATER_OR_EQUAL);
          ppl_Polyhedron_add_constraint (accesses, cstr);
@@ -1740,7 +1740,7 @@ pdr_add_data_dimensions (ppl_Polyhedron_t accesses, data_reference_p dr,
          ppl_new_Linear_Expression_with_dimension (&expr, accessp_nb_dims);
          ppl_set_coef (expr, subscript, -1);
 
-         ppl_set_inhomogeneous (expr, int_cst_value (high));
+         ppl_set_inhomogeneous_tree (expr, high);
 
          ppl_new_Constraint (&cstr, expr, PPL_CONSTRAINT_TYPE_GREATER_OR_EQUAL);
          ppl_Polyhedron_add_constraint (accesses, cstr);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 13dc9e1bf1510b3d8a5ce9c25a39492909fba56f..2ea6e484bb6e4a0bdbd91bbec7d71b3639c5a22a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-22  Sebastian Pop  <sebastian.pop@amd.com>
+
+       PR tree-optimization/46758
+       * gcc.dg/graphite/run-id-pr46758.c: New.
+
 2010-12-23  Sebastian Pop  <sebastian.pop@amd.com>
 
        PR tree-optimization/45552

diff --git a/gcc/testsuite/gcc.dg/graphite/run-id-pr46758.c b/gcc/testsuite/gcc.dg/graphite/run-id-pr46758.c
new file mode 100644 (file)
index 0000000..81411f5
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/graphite/run-id-pr46758.c
@@ -0,0 +1,18 @@
+int
+movegt (int y, long long a)
+{
+  int i;
+  int ret = 0;
+  for (i = 0; i < y; i++)
+    if (a == -1LL << 33)
+      ret = -1;
+  return ret;
+}
+
+int
+main ()
+{
+  if (movegt (1, -1LL << 33) != -1)
+    __builtin_abort ();
+  return 0;
+}