re PR fortran/68224 (ICE on referencing parameter array with dimension null)

2015-11-08  Steven G. Kargl  <kargl@gc.gnu.org>

	PR fortran/68224
	* array.c (match_array_element_spec): Check of invalid NULL().
	While here, fix nearby comments.

2015-11-08  Steven G. Kargl  <kargl@gc.gnu.org>

	PR fortran/68224
	* gfortran.dg/pr68224.f90: New test.

From-SVN: r229955

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index ce3d7d03410deb8afb8ed6ab33fa26e91ccf7049..21534d286287cf3106a04ba61ef9211918a46403 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2015-11-08  Steven G. Kargl  <kargl@gc.gnu.org>
+
+       PR fortran/68224
+       * array.c (match_array_element_spec): Check of invalid NULL().
+       While here, fix nearby comments.
+
 2015-11-08  Paul Thomas  <pault@gcc.gnu.org>
 
        PR fortran/68196

diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c
index 2083044774f7d0ab4aecc8233ba2b26853196af2..0b676af551e342335a4824f9c2b7fca277beb9db 100644 (file)
--- a/gcc/fortran/array.c
+++ b/gcc/fortran/array.c
@@ -147,9 +147,9 @@ matched:
 }
 
 
-/* Match an array reference, whether it is the whole array or a
-   particular elements or a section. If init is set, the reference has
-   to consist of init expressions.  */
+/* Match an array reference, whether it is the whole array or particular
+   elements or a section.  If init is set, the reference has to consist
+   of init expressions.  */
 
 match
 gfc_match_array_ref (gfc_array_ref *ar, gfc_array_spec *as, int init,
@@ -422,6 +422,13 @@ match_array_element_spec (gfc_array_spec *as)
   if (!gfc_expr_check_typed (*upper, gfc_current_ns, false))
     return AS_UNKNOWN;
 
+  if ((*upper)->expr_type == EXPR_FUNCTION && (*upper)->ts.type == BT_UNKNOWN
+      && (*upper)->symtree && strcmp ((*upper)->symtree->name, "null") == 0)
+    {
+      gfc_error ("Expecting a scalar INTEGER expression at %C");
+      return AS_UNKNOWN;
+    }
+
   if (gfc_match_char (':') == MATCH_NO)
     {
       *lower = gfc_get_int_expr (gfc_default_integer_kind, NULL, 1);
@@ -442,13 +449,20 @@ match_array_element_spec (gfc_array_spec *as)
   if (!gfc_expr_check_typed (*upper, gfc_current_ns, false))
     return AS_UNKNOWN;
 
+  if ((*upper)->expr_type == EXPR_FUNCTION && (*upper)->ts.type == BT_UNKNOWN
+      && (*upper)->symtree && strcmp ((*upper)->symtree->name, "null") == 0)
+    {
+      gfc_error ("Expecting a scalar INTEGER expression at %C");
+      return AS_UNKNOWN;
+    }
+
   return AS_EXPLICIT;
 }
 
 
 /* Matches an array specification, incidentally figuring out what sort
-   it is. Match either a normal array specification, or a coarray spec
-   or both. Optionally allow [:] for coarrays.  */
+   it is.  Match either a normal array specification, or a coarray spec
+   or both.  Optionally allow [:] for coarrays.  */
 
 match
 gfc_match_array_spec (gfc_array_spec **asp, bool match_dim, bool match_codim)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2801c946fe7171180b057a225a56373ee5a313c0..f11872fd636efd9d2b374455284888e1818f497f 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-08  Steven G. Kargl  <kargl@gc.gnu.org>
+
+       PR fortran/68224
+       * gfortran.dg/pr68224.f90: New test.
+
 2015-11-08  Paul Thomas  <pault@gcc.gnu.org>
 
        PR fortran/68196

diff --git a/gcc/testsuite/gfortran.dg/pr68224.f90 b/gcc/testsuite/gfortran.dg/pr68224.f90
new file mode 100644 (file)
index 0000000..a5962bb
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr68224.f90
@@ -0,0 +1,10 @@
+! { dg-do compile }
+! PR fortran/68224
+! Original code contribute by Gerhard Steinmetz
+! <gerhard dot steinmetz dot fortran at t-online dot de>
+! 
+program p
+   integer, parameter :: a(null()) = [1, 2]   ! { dg-error "scalar INTEGER expression" }
+   integer, parameter :: b(null():*) = [1, 2]   ! { dg-error "scalar INTEGER expression" }
+   integer, parameter :: c(1:null()) = [1, 2]   ! { dg-error "scalar INTEGER expression" }
+end program p