From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1729) id 5BC633851A82; Wed, 29 Jun 2022 14:48:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5BC633851A82 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Kwok Yeung To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-12] Fix Fortran array-access regressions X-Act-Checkin: gcc X-Git-Author: Kwok Cheung Yeung X-Git-Refname: refs/heads/devel/omp/gcc-12 X-Git-Oldrev: 024485073448e1b02d8bf0c652e3b8e196b9fefb X-Git-Newrev: 9fb0076b11eb2774b620bcf2171d55c7d1fb899f Message-Id: <20220629144848.5BC633851A82@sourceware.org> Date: Wed, 29 Jun 2022 14:48:48 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jun 2022 14:48:48 -0000 https://gcc.gnu.org/g:9fb0076b11eb2774b620bcf2171d55c7d1fb899f commit 9fb0076b11eb2774b620bcf2171d55c7d1fb899f Author: Kwok Cheung Yeung Date: Wed May 25 12:10:03 2022 +0100 Fix Fortran array-access regressions The arguments to gfc_build_array_ref were recently updated in the commit 'fortran: Use pointer arithmetic to index arrays [PR102043]', but a call from gfc_conv_array_ref used the old function signature. This went unnoticed due to the use of default arguments. This patch should be merged into 'Fortran: delinearize multi-dimensional array accesses'. 2022-05-22 Kwok Cheung Yeung gcc/fortran/ * trans-array.cc (gfc_conv_array_ref): Update arguments to gfc_build_array_ref. Diff: --- gcc/fortran/ChangeLog.omp | 5 +++++ gcc/fortran/trans-array.cc | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gcc/fortran/ChangeLog.omp b/gcc/fortran/ChangeLog.omp index ec748026a73..59f47d73b73 100644 --- a/gcc/fortran/ChangeLog.omp +++ b/gcc/fortran/ChangeLog.omp @@ -1,3 +1,8 @@ +2022-05-22 Kwok Cheung Yeung + + * trans-array.cc (gfc_conv_array_ref): Update arguments to + gfc_build_array_ref. + 2022-05-05 Sandra Loosemore Backport from mainline: diff --git a/gcc/fortran/trans-array.cc b/gcc/fortran/trans-array.cc index ac2bac707c1..9c4931db916 100644 --- a/gcc/fortran/trans-array.cc +++ b/gcc/fortran/trans-array.cc @@ -4205,11 +4205,11 @@ gfc_conv_array_ref (gfc_se * se, gfc_array_ref * ar, gfc_expr *expr, gfc_array_index_type, offset, cst_offset); se->class_vptr = vptr; vptr = get_class_array_vptr (se->expr, vptr); - se->expr = gfc_build_array_ref (base, offset, cooked_decl, vptr); + se->expr = gfc_build_array_ref (base, offset, cooked_decl, false, vptr); } - else - /* Return the outermost ARRAY_REF we already built. */ - se->expr = aref; + else + /* Return the outermost ARRAY_REF we already built. */ + se->expr = aref; }