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.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ef46f73..599ee15 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 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
        call to graphite_find_data_references_in_stmt.
        * graphite-sese-to-poly.c (outermost_loop_in_sese_1): New.

diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite
index 12524d4..8855606 100644 (file)
--- a/gcc/ChangeLog.graphite
+++ b/gcc/ChangeLog.graphite
@@ -1,5 +1,12 @@
 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
        call to graphite_find_data_references_in_stmt.
        * graphite-sese-to-poly.c (outermost_loop_in_sese_1): New.

diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c
index 88536fe..c6b4385 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 5edbea6..a03e7d9 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