From: pault <pault@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 19 Oct 2019 16:44:06 +0000 (+0000)
Subject: 2019-10-19  Paul Thomas  <pault@gcc.gnu.org>
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98fdbdbc7469b3811d549950994142d1d46b4dc8;p=thirdparty%2Fgcc.git

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 c5a453330424..642134883db5 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 8cfcc98965e4..695ef57ac329 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)
     {