From: Paul Thomas <pault@gcc.gnu.org>
Date: Sat, 19 Oct 2019 16:44:06 +0000 (+0000)
Subject: re PR fortran/91926 (assumed rank optional)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b3fbf95ec1becab6d713e621175331c57abcaa88;p=gcc.git

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
---

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)
     {