From d53706d2082e6d27a33359842487d50d5ff8fdf9 Mon Sep 17 00:00:00 2001 From: Andre Vehreschild Date: Wed, 13 Jul 2016 19:30:58 +0200 Subject: [PATCH] backport: re PR fortran/71623 (Segfault when allocating deferred-length characters to size of a pointer) gcc/fortran/ChangeLog: 2016-07-13 Andre Vehreschild Backport from trunk: PR fortran/71623 * trans-stmt.c (gfc_trans_allocate): Add code of pre block of typespec in allocate to parent block. gcc/testsuite/ChangeLog: 2016-07-13 Andre Vehreschild Backport from trunk: PR fortran/71623 * gfortran.dg/deferred_character_18.f90: New test. From-SVN: r238308 --- gcc/fortran/ChangeLog | 7 +++++++ gcc/fortran/trans-stmt.c | 21 ++++++++++++++----- gcc/testsuite/ChangeLog | 7 +++++++ .../gfortran.dg/deferred_character_18.f90 | 13 ++++++++++++ 4 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/deferred_character_18.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index bbebfd1a27df..a74afa19d3f1 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2016-07-13 Andre Vehreschild + + Backport from trunk: + PR fortran/71623 + * trans-stmt.c (gfc_trans_allocate): Add code of pre block of typespec + in allocate to parent block. + 2016-07-11 Thomas Koenig Backport from trunk: diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c index 25c2a0c60eb9..1af8732703c2 100644 --- a/gcc/fortran/trans-stmt.c +++ b/gcc/fortran/trans-stmt.c @@ -5651,9 +5651,11 @@ gfc_trans_allocate (gfc_code * code) tmp = gfc_get_char_type (code->ext.alloc.ts.kind); tmp = TYPE_SIZE_UNIT (tmp); tmp = fold_convert (TREE_TYPE (se_sz.expr), tmp); + gfc_add_block_to_block (&block, &se_sz.pre); expr3_esize = fold_build2_loc (input_location, MULT_EXPR, TREE_TYPE (se_sz.expr), tmp, se_sz.expr); + expr3_esize = gfc_evaluate_now (expr3_esize, &block); } } @@ -5848,6 +5850,7 @@ gfc_trans_allocate (gfc_code * code) source= or mold= expression. */ gfc_init_se (&se_sz, NULL); gfc_conv_expr (&se_sz, code->ext.alloc.ts.u.cl->length); + gfc_add_block_to_block (&block, &se_sz.pre); gfc_add_modify (&block, al_len, fold_convert (TREE_TYPE (al_len), se_sz.expr)); @@ -5932,11 +5935,19 @@ gfc_trans_allocate (gfc_code * code) specified by a type spec for deferred length character arrays or unlimited polymorphic objects without a source= or mold= expression. */ - gfc_init_se (&se_sz, NULL); - gfc_conv_expr (&se_sz, code->ext.alloc.ts.u.cl->length); - gfc_add_modify (&block, al_len, - fold_convert (TREE_TYPE (al_len), - se_sz.expr)); + if (expr3_esize == NULL_TREE || code->ext.alloc.ts.kind != 1) + { + gfc_init_se (&se_sz, NULL); + gfc_conv_expr (&se_sz, code->ext.alloc.ts.u.cl->length); + gfc_add_block_to_block (&block, &se_sz.pre); + gfc_add_modify (&block, al_len, + fold_convert (TREE_TYPE (al_len), + se_sz.expr)); + } + else + gfc_add_modify (&block, al_len, + fold_convert (TREE_TYPE (al_len), + expr3_esize)); } else /* No length information needed, because type to allocate diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2956de57444a..9c1ae55b53df 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2016-07-13 Andre Vehreschild + + Backport from trunk: + PR fortran/71623 + * gfortran.dg/deferred_character_18.f90: New test. + + 2016-07-12 Segher Boessenkool Backport from mainline diff --git a/gcc/testsuite/gfortran.dg/deferred_character_18.f90 b/gcc/testsuite/gfortran.dg/deferred_character_18.f90 new file mode 100644 index 000000000000..5a9d725d2635 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/deferred_character_18.f90 @@ -0,0 +1,13 @@ +!{ dg-do run } + +! Check fix for PR fortran/71623 + +program allocatemvce + implicit none + character(len=:), allocatable :: string + integer, dimension(4), target :: array = [1,2,3,4] + integer, dimension(:), pointer :: array_ptr + array_ptr => array + ! The allocate used to segfault + allocate(character(len=size(array_ptr))::string) +end program allocatemvce -- 2.47.2