From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id C3DD63857805; Wed, 18 May 2022 08:43:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C3DD63857805 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" From: Pierre-Marie de Rodat To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-587] [Ada] Fix incorrect freezing with generic child unit X-Act-Checkin: gcc X-Git-Author: =?utf-8?q?Marc_Poulhi=C3=A8s?= X-Git-Refname: refs/heads/master X-Git-Oldrev: bf7143f736d66051083a6f5d569dc85cfad7e7f6 X-Git-Newrev: 5488c78c836ca71330bc69247bf75aa14d9d2603 Message-Id: <20220518084306.C3DD63857805@sourceware.org> Date: Wed, 18 May 2022 08:43:06 +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, 18 May 2022 08:43:06 -0000 https://gcc.gnu.org/g:5488c78c836ca71330bc69247bf75aa14d9d2603 commit r13-587-g5488c78c836ca71330bc69247bf75aa14d9d2603 Author: Marc Poulhiès Date: Mon Mar 28 16:03:48 2022 +0200 [Ada] Fix incorrect freezing with generic child unit The Analyze_Associations.Check_Generic_Parent function was using an incorrect node as the instanciation node for the actual, possibly leading to incorrect freeze node being created (and later crashing in gigi). Using Get_Unit_Instantiation_Node fixes the issue. gcc/ada/ * sem_ch12.adb (Check_Generic_Parent): Use Get_Unit_Instantiation_Node instead of Next. Diff: --- gcc/ada/sem_ch12.adb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb index bc083359813..c5f2eed96fd 100644 --- a/gcc/ada/sem_ch12.adb +++ b/gcc/ada/sem_ch12.adb @@ -1164,7 +1164,7 @@ package body Sem_Ch12 is function Matching_Actual (F : Entity_Id; A_F : Entity_Id) return Node_Id; - -- Find actual that corresponds to a given a formal parameter. If the + -- Find actual that corresponds to a given formal parameter. If the -- actuals are positional, return the next one, if any. If the actuals -- are named, scan the parameter associations to find the right one. -- A_F is the corresponding entity in the analyzed generic, which is @@ -2063,7 +2063,7 @@ package body Sem_Ch12 is procedure Check_Generic_Parent is Inst : constant Node_Id := - Next (Unit_Declaration_Node (Actual)); + Get_Unit_Instantiation_Node (Actual); Par : Entity_Id; begin