From patchwork Fri Oct 23 08:26:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Marie de Rodat X-Patchwork-Id: 1386574 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=adacore.com Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CHclx3JlMz9sSG for ; Fri, 23 Oct 2020 19:27:09 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3A229386EC4D; Fri, 23 Oct 2020 08:27:00 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from rock.gnat.com (rock.gnat.com [205.232.38.15]) by sourceware.org (Postfix) with ESMTP id 0A3A639878C1 for ; Fri, 23 Oct 2020 08:26:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 0A3A639878C1 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=derodat@adacore.com Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id D56EE117E22; Fri, 23 Oct 2020 04:26:39 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at gnat.com Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id Goj8gUSg7Idg; Fri, 23 Oct 2020 04:26:39 -0400 (EDT) Received: from tron.gnat.com (tron.gnat.com [205.232.38.10]) by rock.gnat.com (Postfix) with ESMTP id C2273117E24; Fri, 23 Oct 2020 04:26:39 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id C11BB10B; Fri, 23 Oct 2020 04:26:39 -0400 (EDT) Date: Fri, 23 Oct 2020 04:26:39 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Subject: [Ada] Sync code for external properties with SPARK RM Message-ID: <20201023082639.GA127458@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: , Cc: Piotr Trojanek Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Originally the allowed combinations of external properties (i.e. Async_Readers, Async_Writers, Effective_Writes and Effective_Reads) were described in the SPARK RM as a sequence of conditions. Then they have been rewritten as a table and now the correspondence between description in the SPARK RM and implementation in GNAT is not obvious. This patch makes the implementation to mirror the description; otherwise, semantics is unaffected. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * sem_prag.adb (Check_External_Properties): Rewrite to match the SPARK RM description. diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -29600,44 +29600,38 @@ package body Sem_Prag is ER : Boolean; EW : Boolean) is - begin - -- All properties enabled - - if AR and AW and ER and EW then - null; - - -- Async_Readers + Effective_Writes - -- Async_Readers + Async_Writers + Effective_Writes - - elsif AR and EW and not ER then - null; - - -- Async_Writers + Effective_Reads - -- Async_Readers + Async_Writers + Effective_Reads - - elsif AW and ER and not EW then - null; - - -- Async_Readers + Async_Writers - - elsif AR and AW and not ER and not EW then - null; + type Properties is array (Positive range 1 .. 4) of Boolean; + type Combinations is array (Positive range <>) of Properties; + -- Arrays of Async_Readers, Async_Writers, Effective_Writes and + -- Effective_Reads properties and their combinations, respectively. + + Specified : constant Properties := (AR, AW, EW, ER); + -- External properties, as given by the Item pragma + + Allowed : constant Combinations := + (1 => (True, False, True, False), + 2 => (False, True, False, True), + 3 => (True, False, False, False), + 4 => (False, True, False, False), + 5 => (True, True, True, False), + 6 => (True, True, False, True), + 7 => (True, True, False, False), + 8 => (True, True, True, True)); + -- Allowed combinations, as listed in the SPARK RM 7.1.2(6) table - -- Async_Readers - - elsif AR and not AW and not ER and not EW then - null; - - -- Async_Writers + begin + -- Check if the specified properties match any of the allowed + -- combination; if not, then emit an error. - elsif AW and not AR and not ER and not EW then - null; + for J in Allowed'Range loop + if Specified = Allowed (J) then + return; + end if; + end loop; - else - SPARK_Msg_N - ("illegal combination of external properties (SPARK RM 7.1.2(6))", - Item); - end if; + SPARK_Msg_N + ("illegal combination of external properties (SPARK RM 7.1.2(6))", + Item); end Check_External_Properties; ----------------