From 858f1fa2a3c80a40696ff296bd4a884788997dd5 Mon Sep 17 00:00:00 2001 From: Daniel Kraft Date: Sat, 13 Sep 2008 09:44:36 +0200 Subject: [PATCH] re PR fortran/35770 (implicit character(s) hides type of internal function) 2008-09-13 Daniel Kraft PR fortran/35770 * primary.c (gfc_match_varspec): Added missing type-spec clearing after wrong implicit character typing. 2008-09-13 Daniel Kraft PR fortran/35770 * gfortran.dg/implicit_13.f90: New test. From-SVN: r140336 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/primary.c | 5 ++++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/implicit_13.f90 | 21 +++++++++++++++++++++ 4 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/implicit_13.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 796d36d07893..6460957695d1 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2008-09-13 Daniel Kraft + + PR fortran/35770 + * primary.c (gfc_match_varspec): Added missing type-spec clearing + after wrong implicit character typing. + 2008-09-12 Richard Guenther * trans-intrinsic.c (gfc_conv_intrinsic_transfer): Use diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c index 04c24eb7fe9d..f3e1b038918a 100644 --- a/gcc/fortran/primary.c +++ b/gcc/fortran/primary.c @@ -1869,7 +1869,10 @@ check_substring: case MATCH_NO: if (unknown) - gfc_clear_ts (&primary->ts); + { + gfc_clear_ts (&primary->ts); + gfc_clear_ts (&sym->ts); + } break; case MATCH_ERROR: diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 37cff09e5b76..55513752a08c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-09-13 Daniel Kraft + + PR fortran/35770 + * gfortran.dg/implicit_13.f90: New test. + 2008-09-11 Steve Ellcey * gcc.c-torture/compile/pr11832.c: xfail on ia64-*-*. diff --git a/gcc/testsuite/gfortran.dg/implicit_13.f90 b/gcc/testsuite/gfortran.dg/implicit_13.f90 new file mode 100644 index 000000000000..9007259770fc --- /dev/null +++ b/gcc/testsuite/gfortran.dg/implicit_13.f90 @@ -0,0 +1,21 @@ +! { dg-do compile } + +! PR fortran/35770 +! Implicit declaration hides type of internal function. + +! Contributed by Dick Hendrickson + +IMPLICIT CHARACTER (s) +REAL :: RDA + +RDA = S_REAL_SQRT_I(42) ! { dg-bogus "Can't convert" } + +CONTAINS + +REAL FUNCTION S_REAL_SQRT_I(I) RESULT (R) + IMPLICIT NONE + INTEGER :: I + R = 0.0 +END FUNCTION S_REAL_SQRT_I + +END -- 2.47.3