From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1729) id 82EC13851A87; Wed, 29 Jun 2022 14:46:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 82EC13851A87 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] Fortran: Fix proc pointer as elemental arg handling X-Act-Checkin: gcc X-Git-Author: Tobias Burnus X-Git-Refname: refs/heads/devel/omp/gcc-12 X-Git-Oldrev: 319298fb1af1c38008ea96a212e6bf552c7af004 X-Git-Newrev: 213577701d178daf01480859a27303b680122b91 Message-Id: <20220629144641.82EC13851A87@sourceware.org> Date: Wed, 29 Jun 2022 14:46:41 +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:46:41 -0000 https://gcc.gnu.org/g:213577701d178daf01480859a27303b680122b91 commit 213577701d178daf01480859a27303b680122b91 Author: Tobias Burnus Date: Thu May 12 10:39:58 2022 +0200 Fortran: Fix proc pointer as elemental arg handling The vtab's _callback function calls the elemental 'cb' cb (var(:)%comp, comp_types_vtable._callback); which gets called in a scalarization loop as 'var' might be a nonscalar. Without the patch, that got translated as: D.1234 = &comp_types_vtable._callback ... cb (&(*D.4060)[S.3 + D.4071], &D.1234); where 'D.1234' is function_type. With the patch, it remains a pointer; i.e. D.1234 = comp... and 'cb (..., D.1234)', avoiding ME ICE. Note: Fortran (F2018, C15100) requires that dummy arguments are dummy data objects, which rules out dummy procs/proc-pointer dummies, which is enforced in resolve_fl_procedure. Thus, this change only affects the internally generated code. gcc/fortran/ChangeLog: * trans-array.cc (gfc_scalar_elemental_arg_saved_as_reference): Return true for attr.proc_pointer expressions. gcc/testsuite/ChangeLog: * gfortran.dg/finalize_38.f90: Compile with -Ofast. Diff: --- gcc/fortran/ChangeLog.omp | 5 +++++ gcc/fortran/trans-array.cc | 6 ++++++ gcc/testsuite/ChangeLog.omp | 4 ++++ gcc/testsuite/gfortran.dg/finalize_38.f90 | 1 + 4 files changed, 16 insertions(+) diff --git a/gcc/fortran/ChangeLog.omp b/gcc/fortran/ChangeLog.omp index 0a735989f0c..9d5d2547767 100644 --- a/gcc/fortran/ChangeLog.omp +++ b/gcc/fortran/ChangeLog.omp @@ -1,3 +1,8 @@ +2022-05-12 Tobias Burnus + + * trans-array.cc (gfc_scalar_elemental_arg_saved_as_reference): + Return true for attr.proc_pointer expressions. + 2022-04-27 Tobias Burnus * resolve.cc (gfc_resolve_finalizers): Remove diff --git a/gcc/fortran/trans-array.cc b/gcc/fortran/trans-array.cc index 7ebe0c9196c..43b65c5e629 100644 --- a/gcc/fortran/trans-array.cc +++ b/gcc/fortran/trans-array.cc @@ -3026,6 +3026,12 @@ gfc_scalar_elemental_arg_saved_as_reference (gfc_ss_info * ss_info) && gfc_expr_is_variable (ss_info->expr)) return true; + /* Proc pointers: avoid creating a non-pointer function temporary; + should only get used internally due to constraints. */ + if (!ss_info->data.scalar.needs_temporary && + gfc_expr_attr (ss_info->expr).proc_pointer) + return true; + /* Otherwise the expression is evaluated to a temporary variable before the scalarization loop. */ return false; diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp index bc57cf741f5..c3712b40d01 100644 --- a/gcc/testsuite/ChangeLog.omp +++ b/gcc/testsuite/ChangeLog.omp @@ -1,3 +1,7 @@ +2022-05-12 Tobias Burnus + + * gfortran.dg/finalize_38.f90: Compile with -Ofast. + 2022-04-27 Tobias Burnus * gfortran.dg/abstract_type_6.f03: Remove dg-error as diff --git a/gcc/testsuite/gfortran.dg/finalize_38.f90 b/gcc/testsuite/gfortran.dg/finalize_38.f90 index 442e1753311..99c288784d6 100644 --- a/gcc/testsuite/gfortran.dg/finalize_38.f90 +++ b/gcc/testsuite/gfortran.dg/finalize_38.f90 @@ -1,4 +1,5 @@ ! { dg-do compile } +! { dg-additional-options "-Ofast" } ! ! Check finalization !