From 50b01e1d461c4aeab4eaadc1e861517564a6db29 Mon Sep 17 00:00:00 2001 From: "Steven G. Kargl" Date: Wed, 5 Oct 2016 21:14:14 +0000 Subject: [PATCH] re PR fortran/58991 (ICE with associate and character string constant) 2016-10-05 Steven G. Kargl PR fortran/58991 PR fortran/58992 * resolve.c (resolve_assoc_var): Fix CHARACTER type-spec for a selector in ASSOCIATE. (resolve_fl_variable): Skip checks for an ASSOCIATE variable. 2016-10-05 Steven G. Kargl PR fortran/58991 PR fortran/58992 * gfortran.dg/associate_22.f90: New test. From-SVN: r240812 --- gcc/fortran/ChangeLog | 8 +++++ gcc/fortran/resolve.c | 14 +++++++- gcc/testsuite/ChangeLog | 6 ++++ gcc/testsuite/gfortran.dg/associate_22.f90 | 37 ++++++++++++++++++++++ 4 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/associate_22.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index f7156a1a9a0..2bab7b3110b 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,11 @@ +2016-10-05 Steven G. Kargl + + PR fortran/58991 + PR fortran/58992 + * resolve.c (resolve_assoc_var): Fix CHARACTER type-spec for a + selector in ASSOCIATE. + (resolve_fl_variable): Skip checks for an ASSOCIATE variable. + 2016-10-05 Fritz Reese * interface.c (gfc_compare_types): Don't compare BT_UNION components diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index ddd9d742466..4645b57c78d 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -8304,6 +8304,18 @@ resolve_assoc_var (gfc_symbol* sym, bool resolve_target) /* Mark this as an associate variable. */ sym->attr.associate_var = 1; + /* Fix up the type-spec for CHARACTER types. */ + if (sym->ts.type == BT_CHARACTER && !sym->attr.select_type_temporary) + { + if (!sym->ts.u.cl) + sym->ts.u.cl = target->ts.u.cl; + + if (!sym->ts.u.cl->length) + sym->ts.u.cl->length + = gfc_get_int_expr (gfc_default_integer_kind, + NULL, target->value.character.length); + } + /* If the target is a good class object, so is the associate variable. */ if (sym->ts.type == BT_CLASS && gfc_expr_attr (target).class_ok) sym->attr.class_ok = 1; @@ -11577,7 +11589,7 @@ resolve_fl_variable (gfc_symbol *sym, int mp_flag) if (!deferred_requirements (sym)) return false; - if (sym->ts.type == BT_CHARACTER) + if (sym->ts.type == BT_CHARACTER && !sym->attr.associate_var) { /* Make sure that character string variables with assumed length are dummy arguments. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3d96a06609d..f2e83f838f4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2016-10-05 Steven G. Kargl + + PR fortran/58991 + PR fortran/58992 + * gfortran.dg/associate_22.f90: New test. + 2016-10-05 Fritz Reese * gfortran.dg/dec_union_9.f90: New testcase. diff --git a/gcc/testsuite/gfortran.dg/associate_22.f90 b/gcc/testsuite/gfortran.dg/associate_22.f90 new file mode 100644 index 00000000000..1558992004d --- /dev/null +++ b/gcc/testsuite/gfortran.dg/associate_22.f90 @@ -0,0 +1,37 @@ +! { dg-do run } +program foo + + implicit none + + character(len=4) :: s + character(len=10) :: a + + ! This works. + s = 'abc' + associate(t => s) + if (trim(t) /= 'abc') call abort + end associate + + ! This failed. + associate(u => 'abc') + if (trim(u) /= 'abc') call abort + end associate + + ! This failed. + a = s // 'abc' + associate(v => s // 'abc') + if (trim(v) /= trim(a)) call abort + end associate + + ! This failed. + a = trim(s) // 'abc' + associate(w => trim(s) // 'abc') + if (trim(w) /= trim(a)) call abort + end associate + + ! This failed. + associate(x => trim('abc')) + if (trim(x) /= 'abc') call abort + end associate + +end program foo -- 2.30.2