From patchwork Thu Jul 6 11:38:53 2023 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: 116634 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2493977vqx; Thu, 6 Jul 2023 04:40:25 -0700 (PDT) X-Google-Smtp-Source: APBJJlH4mMmz7tQVFyAlSfRz586yxNknsohJKIzRdfZjrOt8FPMD9wnILaGAGtGZmi1HCxGFNMBX X-Received: by 2002:a17:906:6a1b:b0:98f:450e:fc20 with SMTP id qw27-20020a1709066a1b00b0098f450efc20mr4724047ejc.17.1688643625743; Thu, 06 Jul 2023 04:40:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688643625; cv=none; d=google.com; s=arc-20160816; b=li9mxDOktPNgUdq6h/YH394a7xKN9DGMdKnZFsmSKpy62nCzJafpLVhxSf+x/mbB2B 3XowL1G92bN/tbij7MmDbQyhsh7hsTB8HW6o2pvRFdwkK7RiGSzO7MUEwtD+6pNAf9zS 6UcsdHZfydpph1qIdg9mBdG078h/xfvPCRCLnuC23syOvDfs/If8DpUwd8KQHdRu2pIx CiogM5ZI7CKaC90db9/Jcll9k4eW4cYNiylQmyKqdNOYQb3jFdNmSoIW4ypYWMF09hfK +xIC1yUjke0zzSChLC1Bo/iFElK3Wg2jCAPPXwMqyocTya3xR0ZDCe2dGCHCgElOegdy 70OQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=iM1wfzFWM361/gqPiiOghmpgJzkkfJvT1oHedrYFXLI=; fh=w572rugJMIM9+pZk8ebHF/s1o7vrKucaE4Is50F1zMM=; b=CTYkhKNJ8tRTHPTY723ZC88TCeRSzeXTRFJZXA4ukcZacszOP6iJY1dwoNUnEura1J 3BmG7Y/p6CoiRRugd9xdKW03Td9mvlgM9wjYSUkNLH03nu10Acj0c+LIWXXB7UVgO9bK xXzgR/EpQOsNCqhNkzrxSIYgXG81V4EIBG1jExt4LFL2BIm851xIb0U9fQUWR39RWG8T Vc/9QsenfUNCGWK6jsbTRjnLne9VHqhUcA7RrZHYMuMltp2wEstiVeKx+PO9DepawjkV UPaUoGOaFOn/zNTsSWelDyBnRMJ1QpxVN+GBt4ysryQSsrE8dfm2RDYPX2F6fEq5vaBu pLKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=U2QpUx54; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 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 (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id pw25-20020a17090720b900b00988c64dd7acsi676559ejb.620.2023.07.06.04.40.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 04:40:25 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=U2QpUx54; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 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 DB805385E00D for ; Thu, 6 Jul 2023 11:39:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DB805385E00D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1688643580; bh=iM1wfzFWM361/gqPiiOghmpgJzkkfJvT1oHedrYFXLI=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=U2QpUx54nDOlnj2RmXPifOC9tDtIcgWPeMwCirOuJtB9DDPS/2zcQ90J/4csk5p4X GkcFrXzCLroDS8eCUxAvTTvjhMDx6uGKa7mtWCW0IbKlk77oxc89lZwYzA1kYYm5hz 505LrlcXfE0kcU565F6sGz6FWyuVdbKSLaQj1jDQ= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by sourceware.org (Postfix) with ESMTPS id 9078E3858D37 for ; Thu, 6 Jul 2023 11:38:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9078E3858D37 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-313e742a787so477093f8f.1 for ; Thu, 06 Jul 2023 04:38:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688643535; x=1691235535; 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=iM1wfzFWM361/gqPiiOghmpgJzkkfJvT1oHedrYFXLI=; b=MEMExAUWMDxLStYGV7xNq/4LFUMkoXtjF5AMuz0b6YCNt1lxFWETo36xti95eqqf3K xPtx1l2q3VGQhle2k/7idPp44nuKLzJpaCrl3gAS00WmGMc22hYdfA5mfpGmasiXT/kf HJ3cX4Wvncu+8AhP2C0p99kKeKoGHon1aUcRvtaPcFSV5Wo74tfCWb17OcTKnsEUbLwQ /gIQQ9aHerwC4W6L4SbY+w28Ko2XoHbD8VY9vmBbZiY/yid4pyYKoDWA4Kl4ON6YRYjw 5G4DV4h6twN47C0jrOE3ukXjZ1ykerK+ZvsysGbc+P2W7bN4v3/lStS644y+vNQVrxnZ Ir+A== X-Gm-Message-State: ABy/qLaDlAYp2rQ9y41NteH2svhXSn5SArpDgr0gDY247S4bgD8i4LwO 9g4/KIPbivD8bJz0dMJ5m6Md58aB4SgUneRFMSbSCw== X-Received: by 2002:a5d:58c5:0:b0:314:385d:3f32 with SMTP id o5-20020a5d58c5000000b00314385d3f32mr5045091wrf.29.1688643534728; Thu, 06 Jul 2023 04:38:54 -0700 (PDT) Received: from poulhies-Precision-5550.telnowedge.local (lmontsouris-659-1-24-67.w81-250.abo.wanadoo.fr. [81.250.175.67]) by smtp.gmail.com with ESMTPSA id v13-20020a5d43cd000000b00314427091a2sm1633916wrr.98.2023.07.06.04.38.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jul 2023 04:38:54 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Yannick Moy Subject: [COMMITTED] ada: Improve error message on violation of SPARK_Mode rules Date: Thu, 6 Jul 2023 13:38:53 +0200 Message-Id: <20230706113853.1765963-1-poulhies@adacore.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.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, WEIRD_QUOTING 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?= 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?1770671178416505477?= X-GMAIL-MSGID: =?utf-8?q?1770671178416505477?= From: Yannick Moy SPARK_Mode On can only be used on library-level entities. Improve the error message here. gcc/ada/ * errout.ads: Add explain code. * sem_prag.adb (Check_Library_Level_Entity): Refine error message and add explain code. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/errout.ads | 1 + gcc/ada/sem_prag.adb | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gcc/ada/errout.ads b/gcc/ada/errout.ads index 80dd7dfaead..2065d73614a 100644 --- a/gcc/ada/errout.ads +++ b/gcc/ada/errout.ads @@ -622,6 +622,7 @@ package Errout is GEC_Volatile_Non_Interfering_Context : constant := 0004; GEC_Required_Part_Of : constant := 0009; GEC_Ownership_Moved_Object : constant := 0010; + GEC_SPARK_Mode_On_Not_Library_Level : constant := 0011; ------------------------ -- List Pragmas Table -- diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb index c5810685dc3..6de87fbaba9 100644 --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -24144,7 +24144,8 @@ package body Sem_Prag is -- Local variables - Msg_1 : constant String := "incorrect placement of pragma%"; + Msg_1 : constant String := + "incorrect placement of pragma% with value ""On"" '[[]']"; Msg_2 : Name_Id; -- Start of processing for Check_Library_Level_Entity @@ -24161,6 +24162,7 @@ package body Sem_Prag is and then Instantiation_Location (Sloc (N)) = No_Location then Error_Msg_Name_1 := Pname; + Error_Msg_Code := GEC_SPARK_Mode_On_Not_Library_Level; Error_Msg_N (Fix_Error (Msg_1), N); Name_Len := 0;