summaryrefslogtreecommitdiff
path: root/libgfortran
diff options
context:
space:
mode:
authorPaul Thomas <pault@gcc.gnu.org>2019-10-19 16:44:06 +0000
committerPaul Thomas <pault@gcc.gnu.org>2019-10-19 16:44:06 +0000
commitb3fbf95ec1becab6d713e621175331c57abcaa88 (patch)
tree4e192a7c68daee2385508ca8b39f20a49fe80cab /libgfortran
parent15643a0dfc60e8e53d9b66165f4e2f4fcd8d98de (diff)
re PR fortran/91926 (assumed rank optional)
2019-10-19 Paul Thomas <pault@gcc.gnu.org> PR fortran/91926 * runtime/ISO_Fortran_binding.c (cfi_desc_to_gfc_desc): Revert the change made on 2019-10-05. From-SVN: r277204
Diffstat (limited to 'libgfortran')
-rw-r--r--libgfortran/ChangeLog6
-rw-r--r--libgfortran/runtime/ISO_Fortran_binding.c3
2 files changed, 7 insertions, 2 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index c5a45333042..642134883db 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-19 Paul Thomas <pault@gcc.gnu.org>
+
+ PR fortran/91926
+ * runtime/ISO_Fortran_binding.c (cfi_desc_to_gfc_desc): Revert
+ the change made on 2019-10-05.
+
2019-10-08 Thomas Schwinge <thomas@codesourcery.com>
PR fortran/68401
diff --git a/libgfortran/runtime/ISO_Fortran_binding.c b/libgfortran/runtime/ISO_Fortran_binding.c
index 8cfcc98965e..695ef57ac32 100644
--- a/libgfortran/runtime/ISO_Fortran_binding.c
+++ b/libgfortran/runtime/ISO_Fortran_binding.c
@@ -63,8 +63,7 @@ cfi_desc_to_gfc_desc (gfc_array_void *d, CFI_cdesc_t **s_ptr)
d->dtype.version = s->version;
GFC_DESCRIPTOR_RANK (d) = (signed char)s->rank;
- if (d->dtype.attribute == CFI_attribute_other)
- return;
+ d->dtype.attribute = (signed short)s->attribute;
if (s->rank)
{