public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r14-3988] ada: Assertion failure on expansion of record with invariant
@ 2023-09-14 12:45 Marc Poulhi?s
  0 siblings, 0 replies; only message in thread
From: Marc Poulhi?s @ 2023-09-14 12:45 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:fa16e3229499f4c7c5375bd1bc4b713fb1d2e30e

commit r14-3988-gfa16e3229499f4c7c5375bd1bc4b713fb1d2e30e
Author: Javier Miranda <miranda@adacore.com>
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:
                   --    <Comp_Typ>Invariant (T (_object).<Comp_Id>);
@@ -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                   =>

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2023-09-14 12:45 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-14 12:45 [gcc r14-3988] ada: Assertion failure on expansion of record with invariant Marc Poulhi?s

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).