From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7871) id ACED23858286; Fri, 4 Nov 2022 13:53:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org ACED23858286 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1667570011; bh=hKdzLPmklmqFd34Y5trT1jjkEnPvJ0pu0DoOMT38Ka4=; h=From:To:Subject:Date:From; b=czKItav50DItz01AO8F6yRA0S6iK44YwJi4tispYOw2jhVyugcIw3a7D0PwOFOhPl yHsLFP8YGl3J6/kMeYsgKf1rK/gmVMQ4l+hEmeDNCaxxJHNz4IPZfAwkrKeYic0KhK I94YPxcIWW9cSqREWUY3TUC2RqUJcZq7pE/dkycM= 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 r13-3657] ada: Support lock-free protected objects with pragma Initialize_Scalars X-Act-Checkin: gcc X-Git-Author: Piotr Trojanek X-Git-Refname: refs/heads/master X-Git-Oldrev: 0929de4fd65d9ab63445893d85ebdf21ddc70513 X-Git-Newrev: ffcd1921e0aa37cf6b0fc6926bcadb0e988e4a2a Message-Id: <20221104135331.ACED23858286@sourceware.org> Date: Fri, 4 Nov 2022 13:53:31 +0000 (GMT) List-Id: https://gcc.gnu.org/g:ffcd1921e0aa37cf6b0fc6926bcadb0e988e4a2a commit r13-3657-gffcd1921e0aa37cf6b0fc6926bcadb0e988e4a2a Author: Piotr Trojanek Date: Mon Oct 3 22:03:20 2022 +0200 ada: Support lock-free protected objects with pragma Initialize_Scalars 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. Diff: --- 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