From 0cce86841f6845e7193bed27ccce309578e1caa3 Mon Sep 17 00:00:00 2001 From: Thomas Koenig Date: Fri, 21 Jun 2019 19:32:23 +0000 Subject: [PATCH] backport: re PR fortran/90937 (ICE: in gfc_get_symbol_decl, at fortran/trans-decl.c:1538) 2019-06-21 Thomas Koenig Backport from trunk PR fortran/90937 * trans-types.c (get_formal_from_actual_arglist): Get symbol from current namespace so it will be freed later. If symbol is of type character, get an empty character length. 2019-06-21 Thomas Koenig Backport from trunk PR fortran/90937 * gfortran.dg/external_procedure_4.f90: New test. From-SVN: r272566 --- gcc/fortran/ChangeLog | 8 ++++++++ gcc/fortran/trans-types.c | 9 ++++++++- gcc/testsuite/ChangeLog | 6 ++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index a6b01fc9cfd2..e1549c697b3c 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,11 @@ +2019-06-21 Thomas Koenig + + Backport from trunk + PR fortran/90937 + * trans-types.c (get_formal_from_actual_arglist): Get symbol from + current namespace so it will be freed later. If symbol is of type + character, get an empty character length. + 2019-06-12 Thomas Koenig Tomáš Trnka diff --git a/gcc/fortran/trans-types.c b/gcc/fortran/trans-types.c index a010cf85d300..0b82ceadff35 100644 --- a/gcc/fortran/trans-types.c +++ b/gcc/fortran/trans-types.c @@ -2924,7 +2924,7 @@ get_formal_from_actual_arglist (gfc_symbol *sym, gfc_actual_arglist *actual_args if (a->expr) { snprintf (name, GFC_MAX_SYMBOL_LEN, "_formal_%d", var_num ++); - gfc_get_symbol (name, NULL, &s); + gfc_get_symbol (name, gfc_current_ns, &s); if (a->expr->ts.type == BT_PROCEDURE) { s->attr.flavor = FL_PROCEDURE; @@ -2932,6 +2932,13 @@ get_formal_from_actual_arglist (gfc_symbol *sym, gfc_actual_arglist *actual_args else { s->ts = a->expr->ts; + + if (s->ts.type == BT_CHARACTER) + s->ts.u.cl = gfc_get_charlen (); + + s->ts.deferred = 0; + s->ts.is_iso_c = 0; + s->ts.is_c_interop = 0; s->attr.flavor = FL_VARIABLE; if (a->expr->rank > 0) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 95af0af8f3a4..2536a6f53178 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2019-06-21 Thomas Koenig + + Backport from trunk + PR fortran/90937 + * gfortran.dg/external_procedure_4.f90: New test. + 2019-06-13 Thomas Koenig PR fortran/90870 -- 2.47.2