From: pault Date: Sun, 30 Sep 2018 07:02:49 +0000 (+0000) Subject: 2018-09-30 Paul Thomas X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d9b55b830fa486dfbf5baf23090fa4b5926cde3;p=thirdparty%2Fgcc.git 2018-09-30 Paul Thomas PR fortran/70149 * trans-decl.c (gfc_get_symbol_decl): A deferred character length pointer that is initialized needs the string length to be initialized as well. 2018-09-30 Paul Thomas PR fortran/70149 * gfortran.dg/deferred_character_24.f90 : New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@264721 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index ffada92df314..db17d97fe835 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2018-09-30 Paul Thomas + + PR fortran/70149 + * trans-decl.c (gfc_get_symbol_decl): A deferred character + length pointer that is initialized needs the string length to + be initialized as well. + 2018-09-29 Paul Thomas PR fortran/65667 diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c index 159c3dbbc6b4..f7568d5a6c42 100644 --- a/gcc/fortran/trans-decl.c +++ b/gcc/fortran/trans-decl.c @@ -1759,7 +1759,17 @@ gfc_get_symbol_decl (gfc_symbol * sym) && TREE_CODE (sym->ts.u.cl->backend_decl) != INDIRECT_REF) { gfc_finish_var_decl (length, sym); - gcc_assert (!sym->value); + if (!sym->attr.associate_var + && TREE_CODE (length) == VAR_DECL + && sym->value && sym->value->ts.u.cl->length) + { + gfc_expr *len = sym->value->ts.u.cl->length; + DECL_INITIAL (length) = gfc_conv_initializer (len, &len->ts, + TREE_TYPE (length), + false, false, false); + } + else + gcc_assert (!sym->value); } gfc_finish_var_decl (decl, sym); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2f021f78aac1..2257b179c779 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-09-30 Paul Thomas + + PR fortran/70149 + * gfortran.dg/deferred_character_24.f90 : New test. + 2018-09-29 H.J. Lu PR target/87370 diff --git a/gcc/testsuite/gfortran.dg/deferred_character_24.f90 b/gcc/testsuite/gfortran.dg/deferred_character_24.f90 new file mode 100644 index 000000000000..9f5f7bc2377d --- /dev/null +++ b/gcc/testsuite/gfortran.dg/deferred_character_24.f90 @@ -0,0 +1,23 @@ +! { dg-do run } +! +! Test the fix for PR70149 in which the string length for +! 'number_string' was not initialized. +! +! Contributed by Walter Spector +! +module myptr_mod + implicit none + + integer, target, save :: int_data = 42 + character(16), target, save :: char_data = 'forty two' + + integer, pointer :: number => int_data + character(:), pointer :: number_string => char_data + +end module + + use myptr_mod + if (LEN (number_string) .ne. 16) stop 1 + if (trim (number_string) .ne. 'forty two') stop 2 +end +