From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id 376AA3858D39; Sat, 16 Jul 2022 18:48:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 376AA3858D39 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Harald Anlauf To: gcc-cvs@gcc.gnu.org Subject: [gcc r10-10898] Fortran: do not generate conflicting results under -ff2c [PR104313] X-Act-Checkin: gcc X-Git-Author: Steve Kargl X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: f9b5db872559dd59443c989c31b6caef0ce70e68 X-Git-Newrev: 168a1ae79bb86bdfe482c7c80ea742d40cc414c5 Message-Id: <20220716184848.376AA3858D39@sourceware.org> Date: Sat, 16 Jul 2022 18: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: Sat, 16 Jul 2022 18:48:48 -0000 https://gcc.gnu.org/g:168a1ae79bb86bdfe482c7c80ea742d40cc414c5 commit r10-10898-g168a1ae79bb86bdfe482c7c80ea742d40cc414c5 Author: Steve Kargl Date: Fri Jul 15 22:07:15 2022 +0200 Fortran: do not generate conflicting results under -ff2c [PR104313] gcc/fortran/ChangeLog: PR fortran/104313 * trans-decl.c (gfc_generate_return): Do not generate conflicting fake results for functions with no result variable under -ff2c. gcc/testsuite/ChangeLog: PR fortran/104313 * gfortran.dg/pr104313.f: New test. (cherry picked from commit 517fb1a78102df43f052c6934c27dd51d786aff7) Diff: --- gcc/fortran/trans-decl.c | 2 +- gcc/testsuite/gfortran.dg/pr104313.f | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c index 8aa71ede989..765c492520c 100644 --- a/gcc/fortran/trans-decl.c +++ b/gcc/fortran/trans-decl.c @@ -6545,7 +6545,7 @@ gfc_generate_return (void) NULL_TREE, and a 'return' is generated without a variable. The following generates a 'return __result_XXX' where XXX is the function name. */ - if (sym == sym->result && sym->attr.function) + if (sym == sym->result && sym->attr.function && !flag_f2c) { result = gfc_get_fake_result_decl (sym, 0); result = fold_build2_loc (input_location, MODIFY_EXPR, diff --git a/gcc/testsuite/gfortran.dg/pr104313.f b/gcc/testsuite/gfortran.dg/pr104313.f new file mode 100644 index 00000000000..89c8947cb0a --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr104313.f @@ -0,0 +1,11 @@ +! { dg-do compile } +! { dg-additional-options "-ff2c -fdump-tree-original" } +! +! PR fortran/104313 - ICE verify_gimple failed with -ff2c +! Contributed by G.Steinmetz + + function f(a) + return + end + +! { dg-final { scan-tree-dump-times "return" 1 "original" } }