From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1647) id DA422385734E; Mon, 10 Oct 2022 20:04:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DA422385734E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1665432295; bh=4X7R9rfk8ua0mOZMbdbRH1HuUjbLdSToy+LVezL/0So=; h=From:To:Subject:Date:From; b=se+QxndPNbUwEG2Ks7aFUeovlR6sQtyV3TNdzzyKYxEJoqyoC7XhI9Oain0i6Vgpw 4nS9TUS6SxAiXLm3vkEvXd2kiQqTW56FUxwheNLePaORACGkaOpmNL6zu081sTmmXz IESM0oWknV5kZ4KiM65hDJfW5h0E2mON9C9q0wgo= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Mikael Morin To: gcc-cvs@gcc.gnu.org Subject: [gcc r11-10299] fortran: Fix invalid function decl clobber ICE [PR105012] X-Act-Checkin: gcc X-Git-Author: Mikael Morin X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 0bd19350838bf91a976d5cb96e9457e3e87167e7 X-Git-Newrev: e34e5195025acd623c2383c36b99cc88ca026acf Message-Id: <20221010200455.DA422385734E@sourceware.org> Date: Mon, 10 Oct 2022 20:04:55 +0000 (GMT) List-Id: https://gcc.gnu.org/g:e34e5195025acd623c2383c36b99cc88ca026acf commit r11-10299-ge34e5195025acd623c2383c36b99cc88ca026acf Author: Mikael Morin Date: Mon Aug 29 11:19:29 2022 +0200 fortran: Fix invalid function decl clobber ICE [PR105012] The fortran frontend, as result symbol for a function without declared result symbol, uses the function symbol itself. This caused an invalid clobber of a function decl to be emitted, leading to an ICE, whereas the intended behaviour was to clobber the function result variable. This change fixes the problem by getting the decl from the just-retrieved variable reference after the call to gfc_conv_expr_reference, instead of copying it from the frontend symbol. PR fortran/105012 gcc/fortran/ChangeLog: * trans-expr.c (gfc_conv_procedure_call): Retrieve variable from the just calculated variable reference. gcc/testsuite/ChangeLog: * gfortran.dg/intent_out_15.f90: New test. (cherry picked from commit edaf1e005c90b311c39b46d85cea17befbece112) Diff: --- gcc/fortran/trans-expr.c | 3 ++- gcc/testsuite/gfortran.dg/intent_out_15.f90 | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 906b0a9f623..bed60ceee41 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -6162,7 +6162,8 @@ gfc_conv_procedure_call (gfc_se * se, gfc_symbol * sym, tree var; /* FIXME: This fails if var is passed by reference, see PR 41453. */ - var = e->symtree->n.sym->backend_decl; + var = build_fold_indirect_ref_loc (input_location, + parmse.expr); tree clobber = build_clobber (TREE_TYPE (var)); gfc_add_modify (&se->pre, var, clobber); } diff --git a/gcc/testsuite/gfortran.dg/intent_out_15.f90 b/gcc/testsuite/gfortran.dg/intent_out_15.f90 new file mode 100644 index 00000000000..64334e6f038 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/intent_out_15.f90 @@ -0,0 +1,27 @@ +! { dg-do compile } +! { dg-additional-options "-fdump-tree-original" } +! +! PR fortran/105012 +! The following case was triggering an ICE because of a clobber +! on the DERFC function decl instead of its result. + +module error_function +integer, parameter :: r8 = selected_real_kind(12) ! 8 byte real +contains +SUBROUTINE CALERF_r8(ARG, RESULT, JINT) + integer, parameter :: rk = r8 + real(rk), intent(in) :: arg + real(rk), intent(out) :: result + IF (Y .LE. THRESH) THEN + END IF +end SUBROUTINE CALERF_r8 +FUNCTION DERFC(X) + integer, parameter :: rk = r8 ! 8 byte real + real(rk), intent(in) :: X + real(rk) :: DERFC + CALL CALERF_r8(X, DERFC, JINT) +END FUNCTION DERFC +end module error_function + +! { dg-final { scan-tree-dump-times "CLOBBER" 1 "original" } } +! { dg-final { scan-tree-dump "__result_derfc = {CLOBBER};" "original" } }