From: vondele Date: Fri, 19 Sep 2014 10:28:00 +0000 (+0000) Subject: 2014-09-19 Joost VandeVondele X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a7ef3421340a917d4b7c5c435e4cfacf651715c;p=thirdparty%2Fgcc.git 2014-09-19 Joost VandeVondele PR fortran/63152 * trans-array.c (gfc_trans_deferred_array): Only nullify allocatables. 2014-09-19 Joost VandeVondele PR fortran/63152 * gfortran.dg/auto_char_dummy_array_1.f90: Fix undefined behavior. * gfortran.dg/pr63152.f90: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@215387 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index fe5628b82723..f2bc626fb01c 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2014-09-19 Joost VandeVondele + + PR fortran/63152 + * trans-array.c (gfc_trans_deferred_array): Only nullify allocatables. + 2014-09-15 Jakub Jelinek * Make-lang.in (check_gfortran_parallelize): Change to just an upper diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 123df5d484ed..3ac652385061 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -8647,8 +8647,8 @@ gfc_trans_deferred_array (gfc_symbol * sym, gfc_wrapped_block * block) type = TREE_TYPE (descriptor); } - /* NULLIFY the data pointer. */ - if (GFC_DESCRIPTOR_TYPE_P (type) && !sym->attr.save) + /* NULLIFY the data pointer, for non-saved allocatables. */ + if (GFC_DESCRIPTOR_TYPE_P (type) && !sym->attr.save && sym->attr.allocatable) gfc_conv_descriptor_data_set (&init, descriptor, null_pointer_node); gfc_restore_backend_locus (&loc); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0de1ff84bf3b..b0f2bc80696e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2014-09-19 Joost VandeVondele + + PR fortran/63152 + * gfortran.dg/auto_char_dummy_array_1.f90: Fix undefined behavior. + * gfortran.dg/pr63152.f90: New test. + 2014-09-19 Paolo Carlini PR c++/58328 diff --git a/gcc/testsuite/gfortran.dg/auto_char_dummy_array_1.f90 b/gcc/testsuite/gfortran.dg/auto_char_dummy_array_1.f90 index 6a660c203883..f24ce8876430 100644 --- a/gcc/testsuite/gfortran.dg/auto_char_dummy_array_1.f90 +++ b/gcc/testsuite/gfortran.dg/auto_char_dummy_array_1.f90 @@ -11,6 +11,8 @@ end module global program oh_no_not_pr15908_again character(12), dimension(:), pointer :: ptr + nullify(ptr) + call a (ptr, 12) if (.not.associated (ptr) ) call abort () if (any (ptr.ne."abc")) call abort ()