From 4f1c7759aaead3b108435072b681cedcccd0abd8 Mon Sep 17 00:00:00 2001 From: Paul Thomas Date: Fri, 27 Jan 2006 21:20:12 +0000 Subject: [PATCH] re PR fortran/25964 (NIST regression on fm311.f) 2005-01-27 Paul Thomas 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 PR fortran/25964 * gfortran.dg/assumed_size_refs_3.f90: New test. From-SVN: r110307 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/resolve.c | 1 + gcc/testsuite/ChangeLog | 5 +++++ .../gfortran.dg/assumed_size_refs_3.f90 | 17 +++++++++++++++++ 4 files changed, 29 insertions(+) create mode 100755 gcc/testsuite/gfortran.dg/assumed_size_refs_3.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 37f100d4ce7..2100d5c3acb 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2005-01-27 Paul Thomas + + 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 PR fortran/25324 diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 99fb2a2dd84..ca89f887931 100644 --- a/gcc/fortran/resolve.c +++ b/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 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 04f87643338..ff4f007785d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-01-27 Paul Thomas + + PR fortran/25964 + * gfortran.dg/assumed_size_refs_3.f90: New test. + 2006-01-27 Ben Elliston * gcc.misc-tests/dectest.exp: Remove defunct comment. diff --git a/gcc/testsuite/gfortran.dg/assumed_size_refs_3.f90 b/gcc/testsuite/gfortran.dg/assumed_size_refs_3.f90 new file mode 100755 index 00000000000..b8aa44b7832 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/assumed_size_refs_3.f90 @@ -0,0 +1,17 @@ +! { dg-do compile } +! Tests the fix for PR25951, a regression caused by the assumed +! size patch. +! Test case provided by Mark Hesselink +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 -- 2.30.2