diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1c08e8d29be..914740ab0b2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-30  Sebastian Pop  <sebastian.pop@amd.com>
+
+	* graphite-poly.c (pbb_number_of_iterations_at_time): Only iterate
+	over pbb_dim_iter_domain.
+
 2010-09-30  Sebastian Pop  <sebastian.pop@amd.com>
 
 	* graphite-flattening.c: Fix comments.
diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite
index 00ab0051394..3eaf807484a 100644
--- a/gcc/ChangeLog.graphite
+++ b/gcc/ChangeLog.graphite
@@ -1,3 +1,8 @@
+2010-09-09  Sebastian Pop  <sebastian.pop@amd.com>
+
+	* graphite-poly.c (pbb_number_of_iterations_at_time): Only iterate
+	over pbb_dim_iter_domain.
+
 2010-09-09  Sebastian Pop  <sebastian.pop@amd.com>
 
 	* graphite-flattening.c: Fix comments.
diff --git a/gcc/graphite-poly.c b/gcc/graphite-poly.c
index e09b570ab05..1644ecf7517 100644
--- a/gcc/graphite-poly.c
+++ b/gcc/graphite-poly.c
@@ -1638,6 +1638,7 @@ pbb_number_of_iterations_at_time (poly_bb_p pbb,
 {
   ppl_Pointset_Powerset_C_Polyhedron_t domain, sctr_lb, sctr_ub;
   ppl_dimension_type domain_dim, sctr_dim;
+  graphite_dim_t dim_iter_domain = pbb_dim_iter_domain (pbb);
   ppl_Linear_Expression_t le;
   mpz_t lb, ub, diff, one;
   int i;
@@ -1648,6 +1649,7 @@ pbb_number_of_iterations_at_time (poly_bb_p pbb,
     (&domain, PBB_DOMAIN (pbb));
 
   ppl_Pointset_Powerset_C_Polyhedron_space_dimension (domain, &domain_dim);
+
   mpz_init (diff);
   mpz_init (lb);
   mpz_init (ub);
@@ -1658,7 +1660,7 @@ pbb_number_of_iterations_at_time (poly_bb_p pbb,
      that upper bound to the scattering.  */
   ppl_new_Pointset_Powerset_C_Polyhedron_from_C_Polyhedron
     (&sctr_ub, PBB_TRANSFORMED_SCATTERING (pbb));
-  for (i = 0; i < (int) domain_dim; i++)
+  for (i = 0; i < (int) dim_iter_domain; i++)
     {
       ppl_Linear_Expression_t eq;
       ppl_Constraint_t pc;
@@ -1695,7 +1697,7 @@ pbb_number_of_iterations_at_time (poly_bb_p pbb,
      it to the scattering.  */
   ppl_new_Pointset_Powerset_C_Polyhedron_from_C_Polyhedron
     (&sctr_lb, PBB_TRANSFORMED_SCATTERING (pbb));
-  for (i = 0; i < (int) domain_dim; i++)
+  for (i = 0; i < (int) dim_iter_domain; i++)
     {
       ppl_Linear_Expression_t eq;
       ppl_Constraint_t pc;