From patchwork Fri Nov 4 13:54:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc_Poulhi=C3=A8s?= X-Patchwork-Id: 15532 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp416892wru; Fri, 4 Nov 2022 06:56:16 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7/o0tDNxjR1niESg5+bYmvyHuQL9a+HRFKba7L9udv64Ih7wZa3ry1phhVj77cfCvYbALj X-Received: by 2002:aa7:dc06:0:b0:461:b683:5fba with SMTP id b6-20020aa7dc06000000b00461b6835fbamr35752940edu.72.1667570176411; Fri, 04 Nov 2022 06:56:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667570176; cv=none; d=google.com; s=arc-20160816; b=Q983D5VOgY2i1dW+LQrFNgHEF9rvClNVbINOu5AWbZShzhx6X4cKaLIAz5ip/unmGW Du7znM+7tql4hM3P11hoNcx/56bmo3CIbiVtmrTjksvxUn9ZfEL+LQzwA9hd7LJFuMcm 5oNObYM5sgw9eBoe5XRQYfqI0sbdR9hUwOC0cHuuU7j+X1vzHAGz1a6z75CJ5ZpWH7a2 YIahRjZCalj2U5ae03Q3Hdu5ebzzuEqyFKcEWRpvQoXZQTYyBhenuMPRxMa7Zv7eVQz8 wGu5DF28VwU5frsTE2BHXRiyidWVRFhH71U+aFgqxloIeJgxmeIZmYdc7uehnT6CQC0G Vo/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:from:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=Zer2FjIytOmZfk9YNavA0eSfTw1RrlN3MYtYwaurn9o=; b=B6Y3NegRZcNeExv6fvjB15oneeMDjxjwt1ECovuty73e4dtj4xpChA5/bBrZu97yuo RbAtRydIn+6oJQivfOrZJSCEZhpOyEQETL9xbkNrxiGAwqOdJJEzJX/v5G15VgDMvnQy sAxnHe8uYnO8ro+oLHZVqjFVPj85jtmVt+YecLuFIT2rWbxyNVsnewVt6dM35hB8VVKu CpuPi+4XCmJ8f5aiqseA7WBJvAXB9VRqRFd7TnZGuz4OpyoOuT7Qz+GW2/P3/4A77Mfk Lq6YZNlj30uow5HXTzDW1MJ4xDZENuIpXEE1h11XT9eMgx6iYtIQSkVQDQdRJco9mAMx Do6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=QldMzoe3; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id h8-20020a056402280800b0045a0e39062esi6413253ede.76.2022.11.04.06.56.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Nov 2022 06:56:16 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=QldMzoe3; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1AAB93857BAE for ; Fri, 4 Nov 2022 13:55:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1AAB93857BAE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1667570132; bh=Zer2FjIytOmZfk9YNavA0eSfTw1RrlN3MYtYwaurn9o=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=QldMzoe3Uc4fUGtWdhVoUGCm+R5K8xhGm6KXZaFLdvpK1TIFuDTcia30+zgsE8lqC LoML1JO2z+Aip0Jgk2b4WxH4uMQFzS5HVxYAft+rXLspOL30c2pS1fRFyyZLB5egQV Y/jUfBkx8DBsXLFJWEqggBSBJbvVeAhCXCgEmYek= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by sourceware.org (Postfix) with ESMTPS id 05A4E3857BAD for ; Fri, 4 Nov 2022 13:54:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 05A4E3857BAD Received: by mail-wm1-x32e.google.com with SMTP id fn7-20020a05600c688700b003b4fb113b86so3245379wmb.0 for ; Fri, 04 Nov 2022 06:54:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Zer2FjIytOmZfk9YNavA0eSfTw1RrlN3MYtYwaurn9o=; b=qXJRNEG3PzeczA1JU7REQobfZfDgACA5cW8DYgP31d1UfdwrAvz57losoAdOgozJ4l cEEgvJ/r4HmN8bISL9psVgigsDUPpSjN6F/WoowlzUP3QEaN0itK+wG3QxECnzujzw9T TqbwlBcbhBi9EkwrZ6yFzquf566Rd0lYbTRzAm3bZUmYXjUEsZsnbJrbJCR4p6kl/mPf Gug6GN/b2NpubdXiYhIisAzd5shr8nBLH9G3hxeEG+kg8QCmhrVJmgTQY9TZtL8DM7v7 0OXrnBBx4p9biYBhSyTSLPcWdN/xu2lVGl2gOOPjTPHmZ348QHV7QNi0mVrHSMtfgpMH 06jg== X-Gm-Message-State: ACrzQf1LBb0dRD2NDiJG+vAY5wczlH4pgGD0TgTwYSZqVMyalKZVDpqK +Xho7mE3uKP03zTjIHPPLpn++D4JkL/jPA== X-Received: by 2002:a7b:cc15:0:b0:3b4:ca90:970d with SMTP id f21-20020a7bcc15000000b003b4ca90970dmr24034493wmh.198.1667570071774; Fri, 04 Nov 2022 06:54:31 -0700 (PDT) Received: from localhost.localdomain (static-176-191-105-132.ftth.abo.bbox.fr. [176.191.105.132]) by smtp.gmail.com with ESMTPSA id n21-20020a05600c3b9500b003b4c979e6bcsm3316098wms.10.2022.11.04.06.54.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Nov 2022 06:54:31 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [COMMITTED] ada: Support lock-free protected objects with pragma Initialize_Scalars Date: Fri, 4 Nov 2022 14:54:27 +0100 Message-Id: <20221104135427.85477-1-poulhies@adacore.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: =?utf-8?q?Marc_Poulhi=C3=A8s_via_Gcc-patches?= From: =?utf-8?q?Marc_Poulhi=C3=A8s?= Reply-To: =?utf-8?q?Marc_Poulhi=C3=A8s?= Cc: Piotr Trojanek Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748574065200073869?= X-GMAIL-MSGID: =?utf-8?q?1748574065200073869?= From: Piotr Trojanek 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