From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7871) id EE36D3857716; Thu, 14 Sep 2023 12:45:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EE36D3857716 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1694695529; bh=YdLSJQsrZkW6XZf9U8Knok3y9fZEjWJJCQXfLjJLMtQ=; h=From:To:Subject:Date:From; b=l7JUG3MwCVviip4Kxb8tzMwWNMe8bHeV1aYPmrTG4PXBuzQctDFOYRuVMbFpsAY/g +Pz+1Vb4AWtpZ6SZuu9hf5zFyFZyrgCV23wtwYvYOQiqw7YmAYwroADKEl/NUX5Wt/ RyBO2BRy4P9TSoxDLCa4A7BJW3VniZdQawrTdYbY= 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-3988] ada: Assertion failure on expansion of record with invariant X-Act-Checkin: gcc X-Git-Author: Javier Miranda X-Git-Refname: refs/heads/master X-Git-Oldrev: 61231464d7a0c36ff80e2e2aea2c2d512420f494 X-Git-Newrev: fa16e3229499f4c7c5375bd1bc4b713fb1d2e30e Message-Id: <20230914124529.EE36D3857716@sourceware.org> Date: Thu, 14 Sep 2023 12:45:29 +0000 (GMT) List-Id: https://gcc.gnu.org/g:fa16e3229499f4c7c5375bd1bc4b713fb1d2e30e commit r14-3988-gfa16e3229499f4c7c5375bd1bc4b713fb1d2e30e Author: Javier Miranda Date: Wed Aug 30 19:19:13 2023 +0000 ada: Assertion failure on expansion of record with invariant gcc/ada/ * exp_util.adb (Process_Record_Component): Adjust assertion on the availablity of the invariant procedure; required because the invariant procedure is built by the expander, and hence it is not available compiling generic units or when the sources have errors, since expansion is then disabled. Diff: --- gcc/ada/exp_util.adb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gcc/ada/exp_util.adb b/gcc/ada/exp_util.adb index 0dafa1cd6be..5cfadc5245e 100644 --- a/gcc/ada/exp_util.adb +++ b/gcc/ada/exp_util.adb @@ -3324,7 +3324,13 @@ package body Exp_Util is -- if it has invariants of its own or inherits class-wide -- invariants from parent or interface types. - pragma Assert (Present (Proc_Id)); + -- However, given that the invariant procedure is built by + -- the expander, it is not available compiling generic units + -- or when the sources have errors, since expansion is then + -- disabled. + + pragma Assert (Present (Proc_Id) + or else not Expander_Active); -- Generate: -- Invariant (T (_object).); @@ -3333,7 +3339,9 @@ package body Exp_Util is -- assertions are disabled or Assertion_Policy Ignore is in -- effect. - if not Has_Null_Body (Proc_Id) then + if Present (Proc_Id) + and then not Has_Null_Body (Proc_Id) + then Append_New_To (Comp_Checks, Make_Procedure_Call_Statement (Loc, Name =>