From 727dc1217d05e7879a782b534deb0ec65bce5c91 Mon Sep 17 00:00:00 2001
From: Joost VandeVondele <vondele@gcc.gnu.org>
Date: Fri, 19 Sep 2014 10:28:00 +0000
Subject: re PR fortran/63152 (needless initialization of local pointer
arrays.)
2014-09-19 Joost VandeVondele <vondele@gcc.gnu.org>
PR fortran/63152
* trans-array.c (gfc_trans_deferred_array): Only nullify allocatables.
2014-09-19 Joost VandeVondele <vondele@gcc.gnu.org>
PR fortran/63152
* gfortran.dg/auto_char_dummy_array_1.f90: Fix undefined behavior.
* gfortran.dg/pr63152.f90: New test.
From-SVN: r215387
---
gcc/fortran/ChangeLog | 5 +++++
gcc/fortran/trans-array.c | 4 ++--
gcc/testsuite/ChangeLog | 6 ++++++
gcc/testsuite/gfortran.dg/auto_char_dummy_array_1.f90 | 2 ++
4 files changed, 15 insertions(+), 2 deletions(-)
(limited to 'gcc')
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index fe5628b..f2bc626 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-19 Joost VandeVondele <vondele@gcc.gnu.org>
+
+ PR fortran/63152
+ * trans-array.c (gfc_trans_deferred_array): Only nullify allocatables.
+
2014-09-15 Jakub Jelinek <jakub@redhat.com>
* 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 123df5d..3ac6523 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 0de1ff8..b0f2bc8 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-19 Joost VandeVondele <vondele@gcc.gnu.org>
+
+ 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 <paolo.carlini@oracle.com>
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 6a660c2..f24ce88 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 ()
--
cgit v1.1