2006-12-17 Roger Sayle <roger@eyesopen.com>

	    Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/30207
	* dependency.c (gfc_full_array_ref_p): New function to test whether
	the given array ref specifies the entire array.
	(gfc_dep_resolver): Use gfc_full_array_ref_p to analyze AR_FULL
	array refs against AR_SECTION array refs, and vice versa.
	* dependency.h (gfc_full_array_ref_p): Prototype here.
	* trans-array.c (gfc_conv_expr_descriptor): Use gfc_full_array_ref_p.

	* gfortran.fortran-torture/execute/where21.f90: New test.

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

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 84279a2..a7e2607 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,13 @@
+2006-12-17  Roger Sayle  <roger@eyesopen.com>
+
+       PR fortran/30207
+       * dependency.c (gfc_full_array_ref_p): New function to test whether
+       the given array ref specifies the entire array.
+       (gfc_dep_resolver): Use gfc_full_array_ref_p to analyze AR_FULL
+       array refs against AR_SECTION array refs, and vice versa.
+       * dependency.h (gfc_full_array_ref_p): Prototype here.
+       * trans-array.c (gfc_conv_expr_descriptor): Use gfc_full_array_ref_p.
+
 2006-12-16  Brooks Moses  <brooks.moses@codesourcery.com>
 
        * gfortran.texi: Added TeX support for document parts;

diff --git a/gcc/fortran/dependency.c b/gcc/fortran/dependency.c
index 28c6498..f9ba445 100644 (file)
--- a/gcc/fortran/dependency.c
+++ b/gcc/fortran/dependency.c
@@ -1108,6 +1108,46 @@ gfc_check_element_vs_element (gfc_ref * lref, gfc_ref * rref, int n)
 }
 
 
+/* Determine if an array ref, usually an array section specifies the
+   entire array.  */
+
+bool
+gfc_full_array_ref_p (gfc_ref *ref)
+{
+  int i;
+
+  if (ref->type != REF_ARRAY)
+    return false;
+  if (ref->u.ar.type == AR_FULL)
+    return true;
+  if (ref->u.ar.type != AR_SECTION)
+    return false;
+
+  for (i = 0; i < ref->u.ar.dimen; i++)
+    {
+      /* Check the lower bound.  */
+      if (ref->u.ar.start[i]
+         && (!ref->u.ar.as
+             || !ref->u.ar.as->lower[i]
+             || gfc_dep_compare_expr (ref->u.ar.start[i],
+                                      ref->u.ar.as->lower[i])))
+       return false;
+      /* Check the upper bound.  */
+      if (ref->u.ar.end[i]
+         && (!ref->u.ar.as
+             || !ref->u.ar.as->upper[i]
+             || gfc_dep_compare_expr (ref->u.ar.end[i],
+                                      ref->u.ar.as->upper[i])))
+       return false;
+      /* Check the stride.  */
+      if (ref->u.ar.stride[i]
+         && !gfc_expr_is_one (ref->u.ar.stride[i], 0))
+       return false;
+    }
+  return true;
+}
+
+
 /* Finds if two array references are overlapping or not.
    Return value
        1 : array references are overlapping.
@@ -1145,6 +1185,19 @@ gfc_dep_resolver (gfc_ref * lref, gfc_ref * rref)
          return 0;
        
        case REF_ARRAY:
+          if (lref->u.ar.dimen != rref->u.ar.dimen)
+           {
+             if (lref->u.ar.type == AR_FULL)
+               fin_dep = gfc_full_array_ref_p (rref) ? GFC_DEP_EQUAL
+                                                     : GFC_DEP_OVERLAP;
+             else if (rref->u.ar.type == AR_FULL)
+               fin_dep = gfc_full_array_ref_p (lref) ? GFC_DEP_EQUAL
+                                                     : GFC_DEP_OVERLAP;
+             else
+                return 1;
+             break;
+           }
+
          for (n=0; n < lref->u.ar.dimen; n++)
            {
              /* Assume dependency when either of array reference is vector

diff --git a/gcc/fortran/dependency.h b/gcc/fortran/dependency.h
index 3851ca2..06744fd 100644 (file)
--- a/gcc/fortran/dependency.h
+++ b/gcc/fortran/dependency.h
@@ -22,6 +22,7 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 
 
 bool gfc_ref_needs_temporary_p (gfc_ref *);
+bool gfc_full_array_ref_p (gfc_ref *);
 gfc_expr *gfc_get_noncopying_intrinsic_argument (gfc_expr *);
 int gfc_check_fncall_dependency (gfc_expr *, sym_intent, gfc_symbol *,
                                 gfc_actual_arglist *);

diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index b65ec74..23163d5 100644 (file)
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -4147,7 +4147,6 @@ gfc_conv_expr_descriptor (gfc_se * se, gfc_expr * expr, gfc_ss * ss)
   tree start;
   tree offset;
   int full;
-  gfc_ref *ref;
 
   gcc_assert (ss != gfc_ss_terminator);
 
@@ -4184,25 +4183,7 @@ gfc_conv_expr_descriptor (gfc_se * se, gfc_expr * expr, gfc_ss * ss)
       else if (se->direct_byref)
        full = 0;
       else
-       {
-         ref = info->ref;
-         gcc_assert (ref->u.ar.type == AR_SECTION);
-
-         full = 1;
-         for (n = 0; n < ref->u.ar.dimen; n++)
-           {
-             /* Detect passing the full array as a section.  This could do
-                even more checking, but it doesn't seem worth it.  */
-             if (ref->u.ar.start[n]
-                 || ref->u.ar.end[n]
-                 || (ref->u.ar.stride[n]
-                     && !gfc_expr_is_one (ref->u.ar.stride[n], 0)))
-               {
-                 full = 0;
-                 break;
-               }
-           }
-       }
+       full = gfc_full_array_ref_p (info->ref);
 
       if (full)
        {

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 39abc50..ffb2e3a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-17  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/30207
+       * gfortran.fortran-torture/execute/where21.f90: New test.
+
 2006-12-17  Tobias Burnus  <burnus@net-b.de>
 
        * gfortran.dg/associated_2.f90: Add test for associated(NULL,NULL).

diff --git a/gcc/testsuite/gfortran.fortran-torture/execute/where21.f90 b/gcc/testsuite/gfortran.fortran-torture/execute/where21.f90
new file mode 100644 (file)
index 0000000..6826b87
--- /dev/null
+++ b/gcc/testsuite/gfortran.fortran-torture/execute/where21.f90
@@ -0,0 +1,9 @@
+! { dg-do run }
+! Test fix for PR fortran/30207.
+program a
+  implicit none
+  integer, parameter :: i(4) = (/ 1, 1, 1, 1 /)
+  integer :: z(4) = (/ 1, 1, -1, -1 /)
+  where(z < 0) z(:) = 1
+  if (any(z /= i)) call abort
+end program a