From patchwork Tue May 23 08:09:17 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: 97870 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1978169vqo; Tue, 23 May 2023 01:21:42 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5gLJ9z1gzZNkhbnHviDcKurxIV69Ebnm3v8sC02DeL8vQPZJJ0r7PbnZ51Mm2JMu+E3GVm X-Received: by 2002:a17:907:60cb:b0:96f:9608:da7c with SMTP id hv11-20020a17090760cb00b0096f9608da7cmr11225073ejc.36.1684830102322; Tue, 23 May 2023 01:21:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684830102; cv=none; d=google.com; s=arc-20160816; b=LkU0voXIIASMm+aKcQHEBqqwtUTcNds7nNAcualE6yWLcxwwzaWFK5+LmChs00Ezyd HV+rLqtwuth3Gnq+Yy4wjbzbf0GBZWukPFLpWzwZpl4YaSVkW+8s668aoPdGf3jJA1YQ bkHFMwc3OZL0gPqa4InVYo2IPQ99z1nSov0PdMu55exGA2Urpp8gVmsE8Hx9Oto+PVUI hT3xLGZmr28OIXjfmsKUCyD4DK9KDm1veJUOMmBGEbcBJHcFDoVdGeRQeS56GmWNBvjl /gF/LuFKfzkjggfHmvawfrxAErHn8pEH43pePlHGDp8MatIhP2prHAURkdUZzZAdh/mP yP9w== 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=IPAm1fAo+rucqb11irZRBfka+6IfElf9DDv/l92Qk0A=; b=VXeGd/lC0J/mhAyI2oR7RuZTYryF9zZSJPP22Ky2LWl8DFdu8sS4NVH2jYxol7pOch xP+ySqd6S3qIcAzFWYiWffLqecdkjcybNinYUDRAOA8tWTnCOTrF3ccisDCs+anZBj4P e0/D7rfjUYh4HVEJMBHG7P8SLJ8PwN+h9kKqzo7fHOuRFuWnTh2vwjZY/SDlt29dPKxV RqOLQW+3Q9x3QdUhkrGTfOfcyVn7vnA0tefha707lK4ZxZERzKMAzzcoba5/vWSGtLvy E7+BRT4jI7idrOhwrjqFzeO/YbY8Fz7ZPpkUNsqYuZNcL7Auqk3ztxsWC3oz9VhV4sp7 ANWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=Y5FN7eto; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id i26-20020a170906115a00b0094f64eacdd3si4096564eja.410.2023.05.23.01.21.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 01:21:42 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=Y5FN7eto; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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 227E9395B06A for ; Tue, 23 May 2023 08:14:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 227E9395B06A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1684829643; bh=IPAm1fAo+rucqb11irZRBfka+6IfElf9DDv/l92Qk0A=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=Y5FN7etoO2Hfj6KLn6e5zKsl8lvbpR4cjuSo1cGWF7jh/M3H6Y01z0tXMvLnIiIqp PaccgJatQ4SVEy6xc0qF0UYADKgDga8oauayxIatyKOyrOx62TTliW4olTVL5Ri250 Rg16nPlvJEfPvW4/1N6MYyWvSyJ3C+byxUVFXbVk= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by sourceware.org (Postfix) with ESMTPS id 48C2038323C9 for ; Tue, 23 May 2023 08:09:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 48C2038323C9 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-3f60444238cso20780785e9.3 for ; Tue, 23 May 2023 01:09:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684829359; x=1687421359; 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=IPAm1fAo+rucqb11irZRBfka+6IfElf9DDv/l92Qk0A=; b=FLn5gJDbwBJZl3rwQmt7ccnsbtxUAD4rRX6AF1vzsmUeDI+MevztjtwuNMX+VsW1pi 3AfgLhb1cmB7ArhN8dSuhWZen2Q6sbbnhwgmnZ+6oGWesQL5kUoJaRSlOMugdS9fqZ3X fA55cRtjYB32eUfPrIA989H2nv9VX/h79Z7m63HZUAzUrQmCXJgD+aVAmGwggNeSdVNH iXQew52c886cPx/OnwW0MTpgxod6VVOMzwXT3S9r/atczd7oC5B5wTSPYYsHYEX3d7Up hmT2dZ8Wv+gAOXjI8DpFUej/agoxRCt6haDHOs1kFLf9shO2j0SMjIRiJLIwCJY/d55X 1TMA== X-Gm-Message-State: AC+VfDz0+YUqmtJTf+0OWspEioEVC8HeZHXOSebZGlL2TjbkKGmj6jxh D7cWmR9Nfdb+xlDHxrWvhNVyTxbVunYhkPb5Z1OR2g== X-Received: by 2002:a05:600c:22da:b0:3f5:ff88:8750 with SMTP id 26-20020a05600c22da00b003f5ff888750mr5988779wmg.15.1684829359162; Tue, 23 May 2023 01:09:19 -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 a12-20020a05600c224c00b003edc4788fa0sm14172263wmm.2.2023.05.23.01.09.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 01:09:18 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED] ada: Add tags to warnings controlled by Warn_On_Redundant_Constructs Date: Tue, 23 May 2023 10:09:17 +0200 Message-Id: <20230523080917.1874858-1-poulhies@adacore.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.6 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?1766672409111277203?= X-GMAIL-MSGID: =?utf-8?q?1766672409111277203?= From: Piotr Trojanek Some of the calls to Error_Msg_N controlled by the flag Warn_On_Redundant_Constructs missed the "?r?" tag in their message string. This caused a misleading "[enabled by default]" label to appear next to the error message. Spotted while adding a warning about duplicated choices in exception handlers. gcc/ada/ * freeze.adb (Freeze_Record_Type): Add tag for redundant pragma Pack. * sem_aggr.adb (Resolve_Record_Aggregate): Add tag for redundant OTHERS choice. * sem_ch8.adb (Use_One_Type): Add tag for redundant USE clauses. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/freeze.adb | 2 +- gcc/ada/sem_aggr.adb | 4 ++-- gcc/ada/sem_ch8.adb | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb index 990bace4fba..6014f71e661 100644 --- a/gcc/ada/freeze.adb +++ b/gcc/ada/freeze.adb @@ -5500,7 +5500,7 @@ package body Freeze is if Warn_On_Redundant_Constructs then Error_Msg_N -- CODEFIX - ("??pragma Pack has no effect, no unplaced components", + ("?r?pragma Pack has no effect, no unplaced components", Get_Rep_Pragma (Rec, Name_Pack)); end if; end if; diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb index b44708a3e8c..f1511b70648 100644 --- a/gcc/ada/sem_aggr.adb +++ b/gcc/ada/sem_aggr.adb @@ -5834,9 +5834,9 @@ package body Sem_Aggr is ("OTHERS must represent at least one component", Selectr); elsif Others_Box = 1 and then Warn_On_Redundant_Constructs then - Error_Msg_N ("OTHERS choice is redundant?", Box_Node); + Error_Msg_N ("OTHERS choice is redundant?r?", Box_Node); Error_Msg_N - ("\previous choices cover all components?", Box_Node); + ("\previous choices cover all components?r?", Box_Node); end if; exit Verification; diff --git a/gcc/ada/sem_ch8.adb b/gcc/ada/sem_ch8.adb index 876dbacc951..212c13e12fd 100644 --- a/gcc/ada/sem_ch8.adb +++ b/gcc/ada/sem_ch8.adb @@ -10755,7 +10755,7 @@ package body Sem_Ch8 is Error_Msg_Sloc := Sloc (Clause1); Error_Msg_NE -- CODEFIX ("& is already use-visible through previous " - & "use_type_clause #??", Clause2, T); + & "use_type_clause #?r?", Clause2, T); return; end if; @@ -10827,7 +10827,7 @@ package body Sem_Ch8 is Error_Msg_NE -- CODEFIX ("& is already use-visible through previous " - & "use_type_clause #??", Err_No, Id); + & "use_type_clause #?r?", Err_No, Id); end if; end Use_Clause_Known; @@ -10837,7 +10837,7 @@ package body Sem_Ch8 is else Error_Msg_NE -- CODEFIX ("& is already use-visible through previous " - & "use_type_clause??", Id, T); + & "use_type_clause?r?", Id, T); end if; -- The package where T is declared is already used @@ -10852,7 +10852,7 @@ package body Sem_Ch8 is Error_Msg_Sloc := Sloc (Find_First_Use (Current_Use_Clause (Scope (T)))); Error_Msg_NE -- CODEFIX - ("& is already use-visible through package use clause #??", + ("& is already use-visible through package use clause #?r?", Id, T); end if; @@ -10861,7 +10861,7 @@ package body Sem_Ch8 is else Error_Msg_Node_2 := Scope (T); Error_Msg_NE -- CODEFIX - ("& is already use-visible inside package &??", Id, T); + ("& is already use-visible inside package &?r?", Id, T); end if; end if; end Use_One_Type;