From: "Marc Poulhiès" <poulhies@adacore.com>
To: gcc-patches@gcc.gnu.org
Cc: Javier Miranda <miranda@adacore.com>
Subject: [COMMITTED] ada: Assertion failure on expansion of record with invariant
Date: Thu, 14 Sep 2023 14:46:14 +0200 [thread overview]
Message-ID: <20230914124614.1951192-1-poulhies@adacore.com> (raw)
From: Javier Miranda <miranda@adacore.com>
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.
Tested on x86_64-pc-linux-gnu, committed on master.
---
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 =>
--
2.40.0
reply other threads:[~2023-09-14 12:46 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230914124614.1951192-1-poulhies@adacore.com \
--to=poulhies@adacore.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=miranda@adacore.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).