re PR fortran/36825 ([F08] Rank > 7 arrays [will break library ABI] libgfortran...

2008-07-17  Tobias Burnus  <burnus@net-b.de>

        PR fortran/36825
        PR fortran/36824
        * array.c (gfc_match_array_spec): Fix array-rank check.
        * resolve.c (resolve_fl_derived): Fix constentness check
        for the array dimensions.

2008-07-17  Tobias Burnus  <burnus@net-b.de>

        PR fortran/36825
        PR fortran/36824
        * gfortran.dg/rank_2.f90: Add additional array-rank test.
        * gfortran.dg/array_4.f90: New.

From-SVN: r137910

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index e36e808..5febef3 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-17  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/36825
+       PR fortran/36824
+       * array.c (gfc_match_array_spec): Fix array-rank check.
+       * resolve.c (resolve_fl_derived): Fix constentness check
+       for the array dimensions.
+
 2008-07-14  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * Make-lang.in (gfortranspec.o): Fix dependencies.

diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c
index c6bb5e8..1f41701 100644 (file)
--- a/gcc/fortran/array.c
+++ b/gcc/fortran/array.c
@@ -437,7 +437,7 @@ gfc_match_array_spec (gfc_array_spec **asp)
          goto cleanup;
        }
 
-      if (as->rank > 7
+      if (as->rank >= 7
          && gfc_notify_std (GFC_STD_F2008, "Fortran 2008: Array "
                             "specification at %C with more than 7 dimensions")
             == FAILURE)

diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 273f2ae..a1baa9e 100644 (file)
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -7682,8 +7682,8 @@ resolve_fl_derived (gfc_symbol *sym)
       for (i = 0; i < c->as->rank; i++)
        {
          if (c->as->lower[i] == NULL
-             || !gfc_is_constant_expr (c->as->lower[i])
              || (resolve_index_expr (c->as->lower[i]) == FAILURE)
+             || !gfc_is_constant_expr (c->as->lower[i])
              || c->as->upper[i] == NULL
              || (resolve_index_expr (c->as->upper[i]) == FAILURE)
              || !gfc_is_constant_expr (c->as->upper[i]))

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0eb8eaa..54da1a1 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-17  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/36825
+       PR fortran/36824
+       * gfortran.dg/rank_2.f90: Add additional array-rank test.
+       * gfortran.dg/array_4.f90: New.
+
 2008-07-17  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR testsuite/36443

diff --git a/gcc/testsuite/gfortran.dg/rank_2.f90 b/gcc/testsuite/gfortran.dg/rank_2.f90
index b7d75db..cd52cc4 100644 (file)
--- a/gcc/testsuite/gfortran.dg/rank_2.f90
+++ b/gcc/testsuite/gfortran.dg/rank_2.f90
@@ -5,4 +5,8 @@
 ! Fortran   2008 allows 15 dimensions (including co-array ranks)
 !
 integer :: a(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15) ! { dg-error "more than 7 dimensions" }
+
+! PR fortran/36825:
+integer,parameter                        :: N=10
+complex,dimension(-N:N,-N:N,0:1,0:1,-N:N,-N:N,0:1,0:1)   :: P ! { dg-error "more than 7 dimensions" }
 end