From: "Marc Poulhiès" <poulhies@adacore.com>
To: gcc-patches@gcc.gnu.org
Cc: Piotr Trojanek <trojanek@adacore.com>
Subject: [COMMITTED] ada: Support lock-free protected objects with pragma Initialize_Scalars
Date: Fri, 4 Nov 2022 14:54:27 +0100 [thread overview]
Message-ID: <20221104135427.85477-1-poulhies@adacore.com> (raw)
From: Piotr Trojanek <trojanek@adacore.com>
In general, protected subprograms are only eligible for a lock-free
expansion if they do not reference global assignable objects.
However, it seems reasonable to ignore references to variables in
System.Scalar_Values, which are generated when pragma Initialize_Scalars
is active. Such references appear, for example, when protected
subprogram has formal parameters of mode out.
gcc/ada/
* sem_ch9.adb (Satisfies_Lock_Free_Requirements): Ignore
references to global variables inserted due to pragma
Initialize_Scalars.
Tested on x86_64-pc-linux-gnu, committed on master.
---
gcc/ada/sem_ch9.adb | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/gcc/ada/sem_ch9.adb b/gcc/ada/sem_ch9.adb
index 5dee216256c..e43e3ae0b41 100644
--- a/gcc/ada/sem_ch9.adb
+++ b/gcc/ada/sem_ch9.adb
@@ -474,6 +474,12 @@ package body Sem_Ch9 is
begin
-- Prohibit references to non-constant entities
-- outside the protected subprogram scope.
+ --
+ -- References to variables in System.Scalar_Values
+ -- generated because of pragma Initialize_Scalars are
+ -- allowed, because once those variables are
+ -- initialized by the binder-generated code, they
+ -- behave like constants.
if Is_Assignable (Id)
and then not
@@ -482,6 +488,9 @@ package body Sem_Ch9 is
Scope_Within_Or_Same
(Scope (Id),
Protected_Body_Subprogram (Sub_Id))
+ and then not
+ (Is_RTU (Scope (Id), System_Scalar_Values)
+ and then not Comes_From_Source (N))
then
if Lock_Free_Given then
Error_Msg_NE
--
2.34.1
reply other threads:[~2022-11-04 13:54 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=20221104135427.85477-1-poulhies@adacore.com \
--to=poulhies@adacore.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=trojanek@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).