Only copy PBB_DOMAIN when it is initialized.

2011-01-25  Sebastian Pop  <sebastian.pop@amd.com>

	* graphite-sese-to-poly.c (new_pbb_from_pbb): Only copy PBB_DOMAIN
	when it is initialized.

	* gfortran.dg/graphite/id-23.f: New.

From-SVN: r169219

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ef46f7343699a379362434629e42181c24016656..599ee15eff79a2754d880c1eed406b35d8c6e45a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-25  Sebastian Pop  <sebastian.pop@amd.com>
+
+       * graphite-sese-to-poly.c (new_pbb_from_pbb): Only copy PBB_DOMAIN
+       when it is initialized.
+
 2011-01-25  Sebastian Pop  <sebastian.pop@amd.com>
 
        * graphite-scop-detection.c (stmt_has_simple_data_refs_p): Update

diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite
index 12524d4b9c1e5da785e2f1d3706a7516a9509d19..88556060aded7fdd5cd55b1224a07ce7e95aae49 100644 (file)
--- a/gcc/ChangeLog.graphite
+++ b/gcc/ChangeLog.graphite
@@ -1,3 +1,10 @@
+2011-01-19  Sebastian Pop  <sebastian.pop@amd.com>
+
+       * graphite-sese-to-poly.c (new_pbb_from_pbb): Only copy PBB_DOMAIN
+       when it is initialized.
+
+       * gfortran.dg/graphite/id-23.f: New.
+
 2011-01-19  Sebastian Pop  <sebastian.pop@amd.com>
 
        * graphite-scop-detection.c (stmt_has_simple_data_refs_p): Update

diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c
index 88536fe84af5d836465880224532f75d785ef9ad..c6b4385888796433a1718f1dacd531488b3c881d 100644 (file)
--- a/gcc/graphite-sese-to-poly.c
+++ b/gcc/graphite-sese-to-poly.c
@@ -2152,9 +2152,11 @@ new_pbb_from_pbb (scop_p scop, poly_bb_p pbb, basic_block bb)
     if (VEC_index (poly_bb_p, SCOP_BBS (scop), index) == pbb)
       break;
 
+  if (PBB_DOMAIN (pbb))
+    ppl_new_Pointset_Powerset_C_Polyhedron_from_Pointset_Powerset_C_Polyhedron
+      (&PBB_DOMAIN (pbb1), PBB_DOMAIN (pbb));
+
   GBB_PBB (gbb1) = pbb1;
-  ppl_new_Pointset_Powerset_C_Polyhedron_from_Pointset_Powerset_C_Polyhedron
-    (&PBB_DOMAIN (pbb1), PBB_DOMAIN (pbb));
   GBB_CONDITIONS (gbb1) = VEC_copy (gimple, heap, GBB_CONDITIONS (gbb));
   GBB_CONDITION_CASES (gbb1) = VEC_copy (gimple, heap, GBB_CONDITION_CASES (gbb));
   VEC_safe_insert (poly_bb_p, heap, SCOP_BBS (scop), index + 1, pbb1);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5edbea6997e8be6634b7445ce3181cbdd0b65a26..a03e7d921179d1efb12fe856404345c271f4abf6 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,4 +1,8 @@
-2011-01-21  Sebastian Pop  <sebastian.pop@amd.com>
+2011-01-25  Sebastian Pop  <sebastian.pop@amd.com>
+
+       * gfortran.dg/graphite/id-23.f: New.
+
+2011-01-25  Sebastian Pop  <sebastian.pop@amd.com>
 
        * gfortran.dg/graphite/interchange-3.f90: Un-XFAILed.
 

diff --git a/gcc/testsuite/gfortran.dg/graphite/id-23.f b/gcc/testsuite/gfortran.dg/graphite/id-23.f
new file mode 100644 (file)
index 0000000..74c2928
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/graphite/id-23.f
@@ -0,0 +1,13 @@
+      SUBROUTINE CAMB(RX2,RTX,NUM)
+      DIMENSION RX2(NUM,NUM),RTX(NUM,NUM)
+      DO I=1,NUM
+        DO J=1,I
+          DO M=1,NUM
+            RX2(I,J)=RX2(I,J)+RTX(M,I)
+          END DO
+        END DO
+      END DO
+      IF (RX2(I,1).LE.EIGCT2) THEN
+      RTX(I,1)=4.0D+00
+      END IF
+      END