From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 30 Jan 2018 22:57:51 +0000 (+0100)
Subject: re PR debug/84131 (Fortran dynamical array debug info)
X-Git-Tag: basepoints/gcc-9~1520
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2adfb898bc52d3b83efbe03a94df4d6bc8663ad;p=thirdparty%2Fgcc.git

re PR debug/84131 (Fortran dynamical array debug info)

	PR debug/84131
	* trans-array.c (gfc_get_descriptor_offsets_for_info): Set *data_off
	to DATA_FIELD's offset rather than OFFSET_FIELD's offset.

From-SVN: r257212
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 35894cda5d04..3613d855a388 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2018-01-30  Jakub Jelinek  <jakub@redhat.com>
+
+	PR debug/84131
+	* trans-array.c (gfc_get_descriptor_offsets_for_info): Set *data_off
+	to DATA_FIELD's offset rather than OFFSET_FIELD's offset.
+
 2017-01-30  Thomas Koenig  <tkoenig@gcc.gnu.org>
 
 	PR fortran/84134
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index c16b8754fa3b..40703419d511 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -511,7 +511,7 @@ gfc_get_descriptor_offsets_for_info (const_tree desc_type, tree *data_off,
   tree type;
 
   type = TYPE_MAIN_VARIANT (desc_type);
-  field = gfc_advance_chain (TYPE_FIELDS (type), OFFSET_FIELD);
+  field = gfc_advance_chain (TYPE_FIELDS (type), DATA_FIELD);
   *data_off = byte_position (field);
   field = gfc_advance_chain (TYPE_FIELDS (type), DTYPE_FIELD);
   *dtype_off = byte_position (field);