From eda0ed2597cfab9c967d229b7df2986ef92e663d Mon Sep 17 00:00:00 2001 From: Paul Thomas Date: Mon, 13 Aug 2007 21:02:00 +0000 Subject: [PATCH] re PR fortran/32926 (ICE with external function as argument) 2007-08-13 Paul Thomas PR fortran/32926 * match.c (gfc_match_call): Do not create a new symtree in the case where the existing symbol is external and not referenced. 2007-08-13 Paul Thomas PR fortran/32926 * gfortran.dg/external_procedures_3.f90: New test. From-SVN: r127398 --- gcc/fortran/ChangeLog | 6 ++++ gcc/fortran/match.c | 15 ++++---- gcc/testsuite/ChangeLog | 5 +++ .../gfortran.dg/external_procedures_3.f90 | 35 +++++++++++++++++++ 4 files changed, 55 insertions(+), 6 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/external_procedures_3.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 26a0cd2b7f2..b6edba44b40 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2007-08-13 Paul Thomas + + PR fortran/32926 + * match.c (gfc_match_call): Do not create a new symtree in the + case where the existing symbol is external and not referenced. + 2007-08-13 Paul Thomas PR fortran/32827 diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c index 39e39af29a6..5f56948e0f6 100644 --- a/gcc/fortran/match.c +++ b/gcc/fortran/match.c @@ -2333,13 +2333,16 @@ gfc_match_call (void) if (!sym->attr.generic && !sym->attr.subroutine) { - /* ...create a symbol in this scope... */ - if (sym->ns != gfc_current_ns - && gfc_get_sym_tree (name, NULL, &st) == 1) - return MATCH_ERROR; + if (!(sym->attr.external && !sym->attr.referenced)) + { + /* ...create a symbol in this scope... */ + if (sym->ns != gfc_current_ns + && gfc_get_sym_tree (name, NULL, &st) == 1) + return MATCH_ERROR; - if (sym != st->n.sym) - sym = st->n.sym; + if (sym != st->n.sym) + sym = st->n.sym; + } /* ...and then to try to make the symbol into a subroutine. */ if (gfc_add_subroutine (&sym->attr, sym->name, NULL) == FAILURE) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2235cff60fe..9595f222548 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-08-13 Paul Thomas + + PR fortran/32926 + * gfortran.dg/external_procedures_3.f90: New test. + 2007-08-13 Paul Thomas PR fortran/32827 diff --git a/gcc/testsuite/gfortran.dg/external_procedures_3.f90 b/gcc/testsuite/gfortran.dg/external_procedures_3.f90 new file mode 100644 index 00000000000..987ba793cd0 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/external_procedures_3.f90 @@ -0,0 +1,35 @@ +! { dg-do run } +! Tests the fix for PR32926, in which the call to fcn +! in bar would cause an ICE because it had not been referenced +! in the namespace where it was declared. +! +! Contributed by Ralph Baker Kearfott +! +subroutine foobar1 + common // chr + character(8) :: chr + chr = "foobar1" +end subroutine +subroutine foobar2 + common // chr + character(8) :: chr + chr = "foobar2" +end subroutine + +subroutine foo (fcn) + external fcn + call bar +contains + subroutine bar + call fcn + end subroutine bar +end subroutine foo + + external foo, foobar1, foobar2 + common // chr + character(8) :: chr + call foo (foobar1) + if (chr .ne. "foobar1") call abort () + call foo (foobar2) + if (chr .ne. "foobar2") call abort () +end