re PR fortran/25964 (NIST regression on fm311.f)

2005-01-27  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/25964
	* resolve.c (resolve_function): Add GFC_ISYM_LOC to the list of
	generic_ids exempted from assumed size checking.

2005-01-27  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/25964
	* gfortran.dg/assumed_size_refs_3.f90: New test.

From-SVN: r110307

gcc/fortran/ChangeLog

+2005-01-27  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/25964
+	* resolve.c (resolve_function): Add GFC_ISYM_LOC to the list of
+	generic_ids exempted from assumed size checking.
+
 2006-01-27  Jakub Jelinek  <jakub@redhat.com>
 
 	PR fortran/25324

gcc/fortran/resolve.c

@@ -1304,6 +1304,7 @@ resolve_function (gfc_expr * expr)
   else if (expr->value.function.actual != NULL
 	     && expr->value.function.isym != NULL
 	     && expr->value.function.isym->generic_id != GFC_ISYM_LBOUND
+	     && expr->value.function.isym->generic_id != GFC_ISYM_LOC
 	     && expr->value.function.isym->generic_id != GFC_ISYM_PRESENT)
     {
       /* Array instrinsics must also have the last upper bound of an

gcc/testsuite/ChangeLog

+2005-01-27  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/25964
+	* gfortran.dg/assumed_size_refs_3.f90: New test.
+
 2006-01-27  Ben Elliston  <bje@au.ibm.com>
 
 	* gcc.misc-tests/dectest.exp: Remove defunct comment.

gcc/testsuite/gfortran.dg/assumed_size_refs_3.f90

+! { dg-do compile }
+! Tests the fix for PR25951, a regression caused by the assumed
+! size patch.
+! Test case provided by Mark Hesselink  <mhesseli@caltech.edu>
+PROGRAM loc_1
+  integer i(10)
+  call f (i)
+CONTAINS
+   SUBROUTINE f (x)
+      INTEGER, DIMENSION(*)   :: x
+      INTEGER                 :: address
+! The next line would cause:
+! Error: The upper bound in the last dimension must appear in the
+! reference to the assumed size array 'x' at (1)
+      address=LOC(x)
+   END SUBROUTINE f
+END PROGRAM loc_1
\ No newline at end of file