From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 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-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-3f60444238cso20780785e9.3 for ; Tue, 23 May 2023 01:09:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1684829359; x=1687421359; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=IPAm1fAo+rucqb11irZRBfka+6IfElf9DDv/l92Qk0A=; b=QFTxE+hX92iH9Dimko3aE4paMVQg6WEeKDY50TMfQZrL60FYBEUH4AwQAQRw1/lGLi FZiA+7YA+F5qQ/NMkXm2+g5NCljHLveZNV6Te7s8QIpAeEGfT5WlThXHQvQXtXGrECXD KSbswjq72RUs5nJp9vSNsodgzRyASzF22RbszQlT1P+jfSR5o5M0ob9W7a/kcbEh3Ctg A10I7i+aJLeeQl9ylayVcCI5p2GS9CZdzEsAzClOSOu/LAAZxgA/oqYg4bhGtFvW69DP H7TNN7DRehkJvAv3Tvb0/1L6g2Up1KeR1BU/csEBZ6h7yrS49iWm5GBQPFI+BX6pQI3G vXIQ== 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-Google-Smtp-Source: ACHHUZ6Kb3OujApHU48NwrV5f5X5/CaFAOf424d6P7fPbSsgWJjQuW3pfiG2OdNQggiHjPl1rdRNoQ== 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) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= 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 Content-Transfer-Encoding: 8bit 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 List-Id: 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; -- 2.40.0