From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by sourceware.org (Postfix) with ESMTPS id 3D00C3857004 for ; Mon, 12 Sep 2022 08:19:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3D00C3857004 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-wr1-x433.google.com with SMTP id e16so14067348wrx.7 for ; Mon, 12 Sep 2022 01:19:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date; bh=297+F7x59Dlj5hnpLOy/kqIusun7saGDYbzjQkYIxqM=; b=YAjt3mzSWMNEr0WtaGLB566Tnipu6lqq57EPcGIdp2kMGMc6whAMdxcfGWJAmQ/cur QF2WYd8/qpEu5mxTqgr81xcvmQq/LmqbOG6B+gKnanOY9+l6Me1ExOxi/RSL9RhN0aUb 0pHLEXoVTYnOVs2mIiQWR6E0sgQpcZ9Zg4FiBgNKS6qb3TaH5McBdBdR/CUYI9wtdri9 izQAHb8+zWlJa1Ul6hyj6rEqx5sldbQnBA/TIU96/bwLuuEijzp/ZlaOZRvmWRpPevz6 vRFoTkhV8iFb3sMakfJwVOYm26Cr5xjLgZ06nwDl0OoXs+oocLU9ISactridj1VuVoQn uRNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date; bh=297+F7x59Dlj5hnpLOy/kqIusun7saGDYbzjQkYIxqM=; b=PzrWzDcvZtZVvkO/5F14ZnUbr0vghC0wXBLKU4kwU3oWLVgUW64vW/2fTWOcqOuMCp QgqRTTCagvAvKz0a+mPGaUyuDx3M6B6SgEoKLnGSStWNEv/gYz1/1noEvaKB3LUZFWjW B1QUaCM8c1cC6CQd6EuAdmEHj3RLcaTfolp2M2jQ2Im7U4Z9CKaCvvg8VVjxSqnziaV5 3V8AwQwUgUU+cWyR/qwDUd79L/7I7byPYSCz0R4mvyHHErhxTgK0GIbwWBclKJEfqxmF DNgx+ZDtrqZH+XJT8mpPZ1GIM00eVKEwF4rZV5X6kU1EyalcKNcMyb5GLaxR8xov8buU amgg== X-Gm-Message-State: ACgBeo2OpkYVnLE5hnb6byT/IIyYdlS1X0l5jLeBKFrvNNKNIkzI1brD HmOSIruU7WdUpO0Shq7D6TLPs0dQ6IekZw== X-Google-Smtp-Source: AA6agR7QC87fmXlMT4QZGJbsvZ0IeMQtyJvcWIRkyjjwUuabMQRN/SCJ0wQYIwgxm+Q9EObG8MIeIw== X-Received: by 2002:a5d:6da2:0:b0:228:64cb:5333 with SMTP id u2-20020a5d6da2000000b0022864cb5333mr13544285wrs.428.1662970776174; Mon, 12 Sep 2022 01:19:36 -0700 (PDT) Received: from poulhies-Precision-5550 (lmontsouris-659-1-24-67.w81-250.abo.wanadoo.fr. [81.250.175.67]) by smtp.gmail.com with ESMTPSA id i2-20020a5d4382000000b00228933481dbsm6561716wrq.47.2022.09.12.01.19.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Sep 2022 01:19:35 -0700 (PDT) Date: Mon, 12 Sep 2022 10:19:35 +0200 From: Marc =?iso-8859-1?Q?Poulhi=E8s?= To: gcc-patches@gcc.gnu.org Cc: Yannick Moy Subject: [Ada] Accept explicit SPARK_Mode Auto as configuration pragma Message-ID: <20220912081935.GA1513026@poulhies-Precision-5550> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="T4sUOijqQbZv57TR" Content-Disposition: inline X-Spam-Status: No, score=-12.7 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,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --T4sUOijqQbZv57TR Content-Type: text/plain; charset=us-ascii Content-Disposition: inline An explicit value of Auto is now accepted for a configuration pragma SPARK_Mode, as a way to exempt a unit from complete adherence to SPARK rules when using a global configuration pragma file where SPARK_Mode=>On is specified. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * sem_prag.adb (Analyze_Pragma): Accept SPARK_Mode=>Auto as configuration pragma. (Get_SPARK_Mode): Make the value for Auto explicit. * snames.ads-tmpl (Name_Auto): Add name. --T4sUOijqQbZv57TR Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="patch.diff" 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 @@ -23176,7 +23176,7 @@ package body Sem_Prag is -- SPARK_Mode -- ---------------- - -- pragma SPARK_Mode [(On | Off)]; + -- pragma SPARK_Mode [(Auto | On | Off)]; when Pragma_SPARK_Mode => Do_SPARK_Mode : declare Mode_Id : SPARK_Mode_Type; @@ -23662,7 +23662,7 @@ package body Sem_Prag is -- Check the legality of the mode (no argument = ON) if Arg_Count = 1 then - Check_Arg_Is_One_Of (Arg1, Name_On, Name_Off); + Check_Arg_Is_One_Of (Arg1, Name_Auto, Name_On, Name_Off); Mode := Chars (Get_Pragma_Arg (Arg1)); else Mode := Name_On; @@ -23713,6 +23713,15 @@ package body Sem_Prag is -- the pragma resides to find a potential construct. else + -- An explicit mode of Auto is only allowed as a configuration + -- pragma. Escape "pragma" to avoid replacement with "aspect". + + if Mode_Id = None then + Error_Pragma_Arg + ("only configuration 'p'r'a'g'm'a% can have value &", + Arg1); + end if; + Stmt := Prev (N); while Present (Stmt) loop @@ -31169,7 +31178,9 @@ package body Sem_Prag is function Get_SPARK_Mode_Type (N : Name_Id) return SPARK_Mode_Type is begin - if N = Name_On then + if N = Name_Auto then + return None; + elsif N = Name_On then return On; elsif N = Name_Off then return Off; diff --git a/gcc/ada/snames.ads-tmpl b/gcc/ada/snames.ads-tmpl --- a/gcc/ada/snames.ads-tmpl +++ b/gcc/ada/snames.ads-tmpl @@ -782,6 +782,7 @@ package Snames is Name_Assertion : constant Name_Id := N + $; Name_Assertions : constant Name_Id := N + $; Name_Attribute_Name : constant Name_Id := N + $; + Name_Auto : constant Name_Id := N + $; Name_Body_File_Name : constant Name_Id := N + $; Name_Boolean_Entry_Barriers : constant Name_Id := N + $; Name_By_Any : constant Name_Id := N + $; --T4sUOijqQbZv57TR--