[PATCH 6/6] fortran: Remove overwrite of polymorphic associate variable offset

[Mikael Morin]

From: Mikael Morin <mik...@gcc.gnu.org>

Regression-tested on x86_64-pc-linux-gnu.
OK for master?

-- >8 --

The array descriptor returned by gfc_conv_expr_descriptor should be
usable as is.  No need to overwrite the offset.

gcc/fortran/ChangeLog:

        * trans-stmt.cc (trans_associate_var): Remove overwrite of
        the polymorphic associate variable's array descriptor offset.
---
 gcc/fortran/trans-stmt.cc | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/gcc/fortran/trans-stmt.cc b/gcc/fortran/trans-stmt.cc
index 493984f2937..69548a21a27 100644
--- a/gcc/fortran/trans-stmt.cc
+++ b/gcc/fortran/trans-stmt.cc
@@ -1876,9 +1876,6 @@ trans_associate_var (gfc_symbol *sym, gfc_wrapped_block 
*block)
   bool class_target;
   bool unlimited;
   tree desc;
-  tree offset;
-  tree dim;
-  int n;
   tree charlen;
   bool need_len_assign;
   bool whole_array = true;
@@ -2293,21 +2290,6 @@ trans_associate_var (gfc_symbol *sym, gfc_wrapped_block 
*block)
 
          desc = gfc_class_data_get (se.expr);
 
-         /* Set the offset.  */
-         offset = gfc_index_zero_node;
-         for (n = 0; n < e->rank; n++)
-           {
-             dim = gfc_rank_cst[n];
-             tmp = fold_build2_loc (input_location, MULT_EXPR,
-                                    gfc_array_index_type,
-                                    gfc_conv_descriptor_stride_get (desc, dim),
-                                    gfc_conv_descriptor_lbound_get (desc, 
dim));
-             offset = fold_build2_loc (input_location, MINUS_EXPR,
-                                       gfc_array_index_type,
-                                       offset, tmp);
-           }
-         gfc_conv_descriptor_offset_set (&se.pre, desc, offset);
-
          if (need_len_assign)
            {
              if (e->symtree
-- 
2.47.2