From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7871) id 19D303858418; Tue, 13 Jun 2023 07:34:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 19D303858418 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1686641640; bh=mxVTf9e+zZmDOWl+Y9/LB10qzk1QSzuiUt+3Nt4Echg=; h=From:To:Subject:Date:From; b=vghM/ctiD+coELQ8iaEqASZ/d5W/0vNp/gVnezp3CFiMZOvt4uhfkfQ3MFiFeWwW3 ZL9NpKC/r7JS2maV5cMnVnDzWN5T3NXetH1d66vm/6vufyCPHk3jDqofcuSNu0oNdd KESaTbAPaaTso3H6SRPzv74HXrZZZOMP908AKEJs= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Marc Poulhi?s To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-1764] ada: Fix internal error on imported function with post-condition X-Act-Checkin: gcc X-Git-Author: Eric Botcazou X-Git-Refname: refs/heads/master X-Git-Oldrev: c0ceba6c86ae4fcefa720b0976c58481c903eb63 X-Git-Newrev: 54dd56f5c82ff26e46e8b24214d0988da8e3ad8a Message-Id: <20230613073400.19D303858418@sourceware.org> Date: Tue, 13 Jun 2023 07:34:00 +0000 (GMT) List-Id: https://gcc.gnu.org/g:54dd56f5c82ff26e46e8b24214d0988da8e3ad8a commit r14-1764-g54dd56f5c82ff26e46e8b24214d0988da8e3ad8a Author: Eric Botcazou Date: Mon Apr 24 17:11:01 2023 +0200 ada: Fix internal error on imported function with post-condition The problem, which is also present for an expression function, is that the function is invoked in the initializing expression of a variable declared in the same declarative part as the function, which causes the freezing of its artificial body before the post-condition is analyzed on its spec. gcc/ada/ * contracts.adb (Analyze_Entry_Or_Subprogram_Body_Contract): For a subprogram body that has no contracts and does not come from source, make sure that contracts on its corresponding spec are analyzed, if any, before expanding them. Diff: --- gcc/ada/contracts.adb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gcc/ada/contracts.adb b/gcc/ada/contracts.adb index 7625abf9554..ae9e07ffc16 100644 --- a/gcc/ada/contracts.adb +++ b/gcc/ada/contracts.adb @@ -598,6 +598,22 @@ package body Contracts is else Set_Analyzed (Items); end if; + + -- When this is a subprogram body not coming from source, for example an + -- expression function, it does not cause freezing of previous contracts + -- (see Analyze_Subprogram_Body_Helper), in particular not of those on + -- its spec if it exists. In this case make sure they have been properly + -- analyzed before being expanded below, as we may be invoked during the + -- freezing of the subprogram in the middle of its enclosing declarative + -- part because the declarative part contains e.g. the declaration of a + -- variable initialized by means of a call to the subprogram. + + elsif Nkind (Body_Decl) = N_Subprogram_Body + and then not Comes_From_Source (Original_Node (Body_Decl)) + and then Present (Corresponding_Spec (Body_Decl)) + and then Present (Contract (Corresponding_Spec (Body_Decl))) + then + Analyze_Entry_Or_Subprogram_Contract (Corresponding_Spec (Body_Decl)); end if; -- Due to the timing of contract analysis, delayed pragmas may be