From patchwork Mon May 28 08:58:14 2018 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: 921371 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-478598-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="c6KboyAG"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40vW3q6XZ2z9s0q for ; Mon, 28 May 2018 18:58:31 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; q=dns; s=default; b=BTz8yuYXqpqsDKzJzErWhjB/0ERStjuS96kL6b3TPgI/uBaIYM RiyPzkIV2H16CnMNbHDCfTIezDHtdKUjo0OHzPSb48DU5lFeYPlC9Du8Nghpciww kZ/aOdS6fe3iFRRwuZTktB15PiQXG1JKprJz1myPtuh5rYppqzeNrCr4A= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; s= default; bh=clm2WLGZr8a3LUB6btWqwlwhliI=; b=c6KboyAGZnq1nf3BEffy DmcH0hm+zxzcT0LqRO1ATMdmHvDHwmruqwnbCHazKnooHSSWlwm7Lr5f56u5o8l2 Lr/Cv2l7U4EwyIr/FzxY6zA9bM8rhptksCqFc4C6ou6BlWFwznSx9NKXlLp8x4se 2aMr+OrKnmciUnj+BkOQuMc= Received: (qmail 61976 invoked by alias); 28 May 2018 08:58:17 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 61887 invoked by uid 89); 28 May 2018 08:58:16 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.9 required=5.0 tests=BAYES_00, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=sk:N_Full_, sk:n_full_ X-HELO: rock.gnat.com Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 28 May 2018 08:58:15 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 19E58117DA5; Mon, 28 May 2018 04:58:14 -0400 (EDT) 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 6JWc45YI27Uf; Mon, 28 May 2018 04:58:14 -0400 (EDT) Received: from tron.gnat.com (tron.gnat.com [IPv6:2620:20:4000:0:46a8:42ff:fe0e:e294]) by rock.gnat.com (Postfix) with ESMTP id 09977117DA1; Mon, 28 May 2018 04:58:14 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id 088DE4EF; Mon, 28 May 2018 04:58:14 -0400 (EDT) Date: Mon, 28 May 2018 04:58:14 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Cc: Hristian Kirtchev Subject: [Ada] Spurious error on aspect Volatile Message-ID: <20180528085814.GA68288@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-IsSubscribed: yes This patch modifies the analysis of aspect/pragma Volatile to correct accept the annotation when it applies to single protected and single task types, and SPARK_Mode On is in effect. ------------ -- Source -- ------------ -- pack.ads package Pack with SPARK_Mode is protected PO_Aspect with Volatile is end; -- OK protected PO_Pragma is end; pragma Volatile (PO_Pragma); -- OK task TO_Aspect with Volatile; -- OK task TO_Pragma; pragma Volatile (TO_Pragma); -- OK end Pack; ---------------------------- -- Compilation and output -- ---------------------------- $ gcc -c pack.ads $ gcc -c pack.ads -gnatd.F cannot generate code for file pack.ads (package spec) Tested on x86_64-pc-linux-gnu, committed on trunk 2018-05-28 Hristian Kirtchev gcc/ada/ * sem_prag.adb (Process_Atomic_Independent_Shared_Volatile): Include the declarations of single concurrent types because they fall in the category of full type and object declarations. --- gcc/ada/sem_prag.adb +++ gcc/ada/sem_prag.adb @@ -7399,9 +7399,11 @@ package body Sem_Prag is if SPARK_Mode = On and then Prag_Id = Pragma_Volatile - and then - not Nkind_In (Original_Node (Decl), N_Full_Type_Declaration, - N_Object_Declaration) + and then not Nkind_In (Original_Node (Decl), + N_Full_Type_Declaration, + N_Object_Declaration, + N_Single_Protected_Declaration, + N_Single_Task_Declaration) then Error_Pragma_Arg ("argument of pragma % must denote a full type or object "