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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@277204 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index c5a45333042499cb4bfd2b8388c58b54ec4685f8..642134883db55c5960522a49bf5939a02cb25e14 100644 (file)
--- 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 8cfcc98965e498e4e79f9efc412489b904ebadca..695ef57ac32977455ff2980c5cbe139b14d64f45 100644 (file)
--- 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)
     {