From patchwork Mon May 29 08:29:02 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: 100151 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1363397vqr; Mon, 29 May 2023 01:37:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6as3hPE0Nvq6GmEBQGfghNz6TR6nQvJaQAOy1k1fy/tFgTyI1dElUgLaDaLtanTUCIPwZO X-Received: by 2002:a05:6402:356:b0:510:f8d7:1f4e with SMTP id r22-20020a056402035600b00510f8d71f4emr1711361edw.3.1685349457428; Mon, 29 May 2023 01:37:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685349457; cv=none; d=google.com; s=arc-20160816; b=Q1+aaMM2iFktcWdtbV9p5jivlEg8hlsdpC6FDsQiaKN3atAQfePBVqJgyVonLg3EbF MPjHOeAQY/hw8BLVaUWIX5Ls9Ex6TsrQ5cnZDfLUAA44nwlRyFY+Gt4rNbsyW9aInOiZ ICxVz3VyV9nJGgIjEKhPy2k7t6MDcLomMNIzaqfZlkZSqI0dMmtusDZL1IoHLPWuBG8v lYd/bBKv3394BaoTBQueduYCl8YKhuER3FfHYC8aFKi5L/sfHKMYqcG1bT++XlzoEFJ0 C1qbfoN3WW+kBzndEjFYgWCyXBeTayLJvIhcVWUAE866YVLlxmeMCx8zgUl8T+U66SvW EYcg== 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=ZTPUn+BZbvm/CJxq4N0s/QyniKOtC6L7gvcsrCFhd20=; b=JZ3Pb32i9Q0fgpXWkbuF0euGR9pwRxq37csPo1jX2sbaV3xOjwqeeFKGpv1lY0ZTw+ RTgqUTfVStEAypb0eT7oftbwpkFyxY+yapyWf1QmJtc84T3/4/uY3c715bTAgBo9ttZs 0UPfSfd85R3C5WCxAmLJtCHPDhJMHJbAOnbHkyc0JlYRdo7C8CALQPgr/j6ieIwlRxsU 5Awjiqn/ZQHLvRiByQ/R688Nh/AW+57vCOh5zOmbihaCqXooWQTYUp+uv0SzOPW9ue0F T3ZD7xTQ0y/BFt0jKlEH5qqwHZlfx9ax/bS5wJsIRRH3sj4H4iKm8jOFl1K7xq4WbEqg Gf0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=pfvljPcK; 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 sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id f4-20020a056402068400b00514a5da0efasi176402edy.465.2023.05.29.01.37.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 May 2023 01:37:37 -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=pfvljPcK; 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 83D0F38114F0 for ; Mon, 29 May 2023 08:33:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 83D0F38114F0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1685349228; bh=ZTPUn+BZbvm/CJxq4N0s/QyniKOtC6L7gvcsrCFhd20=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=pfvljPcK3aS7AfxkCRM7D5w0pZrUjvmPwLsluOlAY6iAnu3QUVX+jc+GRMIVEN3PD gcHhHlCwttM75vxoEewhAlc1nKm7bK8q6lmb06EtqwJbC5MA5+322DS5DJH8cKGDnZ sSs0iyoAqtkp3y9LPSC3XAI0Z46wlPv62pnCG2Gs= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by sourceware.org (Postfix) with ESMTPS id 7AEB5385703C for ; Mon, 29 May 2023 08:29:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7AEB5385703C Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-3f6cbf02747so19351815e9.1 for ; Mon, 29 May 2023 01:29:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685348944; x=1687940944; 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=ZTPUn+BZbvm/CJxq4N0s/QyniKOtC6L7gvcsrCFhd20=; b=OEXoevQUSuYA2upbaLi94xS7CtdvgcHARP2JwJ5IDVMaG9wi6h2/Hb0KBAqkux24TE upDjgPrzeVUzQkVbFVro3zN/JwZsCI+sqr1LMJcpHor3r/sSSI/cT9m6cheTkMCJ/8DV pr70pZsqI0RWwUKMqyitS/hHSoWXwWKhw8ds/zxgpKVJwWd9qKiJ2t6AzWVm3fBwEHX+ x1SJ50szcpu7rxWazc46c63UvbfWu1m5qwqtbVnHnCz83gATI0TG/SzMPsOzgr7Y8iDf GIqHeIMQkPN61QiNTGn3cfMShRr8kUuqd8GiEDPBo1Y4CGE2s3PPCGliPawP+nk1HAM6 IbPQ== X-Gm-Message-State: AC+VfDw/K0r5KWMXUP9O/b8ckX4a0SptQlUxYYaYawIGJv/sqyL3wZS8 44opD7xTcVOqkXIXmOS66OwgVLOFzfE6dCxrOw6Nkg== X-Received: by 2002:a1c:7905:0:b0:3f6:91c:4e86 with SMTP id l5-20020a1c7905000000b003f6091c4e86mr7811034wme.3.1685348944353; Mon, 29 May 2023 01:29:04 -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 y8-20020a1c4b08000000b003f4289b18a7sm13512224wma.5.2023.05.29.01.29.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 May 2023 01:29:03 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED] ada: Tune message for missing 'Result in Contract_Cases Date: Mon, 29 May 2023 10:29:02 +0200 Message-Id: <20230529082902.2409451-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 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?1767216993103196190?= X-GMAIL-MSGID: =?utf-8?q?1767216993103196190?= From: Piotr Trojanek Make the message consistent with the one for postcondition. gcc/ada/ * sem_util.adb (Check_Result_And_Post_State): Tune message. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_util.adb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 9d12ee71d93..1839214332d 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -4644,7 +4644,8 @@ package body Sem_Util is -- attribute 'Result. elsif Present (Case_Prag) and then not Seen_In_Case then - Error_Msg_N ("contract cases do not mention result?.t?", Case_Prag); + Error_Msg_N + ("contract cases do not mention function result?.t?", Case_Prag); -- The function has non-trivial postconditions only and they do not -- mention attribute 'Result.