From: Paul Thomas Date: Wed, 16 May 2018 10:41:48 +0000 (+0000) Subject: re PR fortran/83898 (ICE in gfc_conv_expr_descriptor, at fortran/trans-array.c:7181) X-Git-Tag: releases/gcc-6.5.0~319 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c785e2c364f4973080f70aab8f0511270e75afa6;p=thirdparty%2Fgcc.git re PR fortran/83898 (ICE in gfc_conv_expr_descriptor, at fortran/trans-array.c:7181) 2018-16-05 Paul Thomas PR fortran/83898 Backport from trunk * trans-stmt.c (trans_associate_var): Do not set cst_array_ctor for characters. 2018-16-05 Paul Thomas PR fortran/83898 Backport from trunk * gfortran.dg/associate_33.f03 : New test. From-SVN: r260284 --- diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 2f13abb8732e..e5674bdbce7e 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2018-16-05 Paul Thomas + + PR fortran/83898 + Backport from trunk + * trans-stmt.c (trans_associate_var): Do not set cst_array_ctor + for characters. + 2018-05-13 Paul Thomas PR fortran/68846 diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c index 45510bc51f73..58add0b5d9b2 100644 --- a/gcc/fortran/trans-stmt.c +++ b/gcc/fortran/trans-stmt.c @@ -1541,7 +1541,8 @@ trans_associate_var (gfc_symbol *sym, gfc_wrapped_block *block) desc = sym->backend_decl; cst_array_ctor = e->expr_type == EXPR_ARRAY - && gfc_constant_array_constructor_p (e->value.constructor); + && gfc_constant_array_constructor_p (e->value.constructor) + && e->ts.type != BT_CHARACTER; /* If association is to an expression, evaluate it and create temporary. Otherwise, get descriptor of target for pointer assignment. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0a3cdbf0df58..4aa19625332d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2018-16-05 Paul Thomas + + PR fortran/83898 + Backport from trunk + * gfortran.dg/associate_33.f03 : New test. + 2018-05-13 Paul Thomas PR fortran/68846 diff --git a/gcc/testsuite/gfortran.dg/associate_33.f03 b/gcc/testsuite/gfortran.dg/associate_33.f03 new file mode 100644 index 000000000000..1f87b22e8e48 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/associate_33.f03 @@ -0,0 +1,11 @@ +! { dg-do run } +! +! Test the fix for PR83898.f90 +! +! Contributed by G Steinmetz +! +program p + associate (x => ['1','2']) + if (any (x .ne. ['1','2'])) call abort + end associate +end