From patchwork Mon Nov 7 08:40:34 2022 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: 16312 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1921288wru; Mon, 7 Nov 2022 00:48:31 -0800 (PST) X-Google-Smtp-Source: AA0mqf4Wo7jL8VJJ9NtTal2stlH3e+5rZaiQgu7eevRYBAm3MtcIyMIK6DW3My0rOhG0eqyKeS+B X-Received: by 2002:aa7:db4e:0:b0:463:2979:5e49 with SMTP id n14-20020aa7db4e000000b0046329795e49mr5278754edt.266.1667810911026; Mon, 07 Nov 2022 00:48:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667810911; cv=none; d=google.com; s=arc-20160816; b=tTWlKS1N4UEQWY3ozZMvQT+qVvOmAY3v8NnfaiR/C4lxW9OKipc4GXluNfTs5ool3b 1FuLOfYMJ8fvDl4PiNNjfsMMRP/aR1q0496QhDpDEFWI8YhXwdQXuLHIe+Ir2OJFjP+J UkcSm2/uTyEr5KumPMu/DxZ8g0ErCCa0PwCGcISlXuh7qN5sSlFwjIpzn7123s4wFcjd b9dl/kN02SHqFfjiyEcjfC7OvJzzdlsacKUiFEJq8vcwsflzDCZaNYznph3wLWsLFAE1 5Xr6CVl8SumrmH/iUfEYriAW7yNzH2gHpdFTHuDL7VACCH/sm/+RZoWXwUDTKSIquXQm vEsw== 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=i5M1vXD6A4TdiPKeS19lsiIwlchrRmKfBXb1c+PKIzU=; b=orw25on7bExFCIVC3q8Fy5ae+yowoMTr1hKcdLS33jkuLWwRKRBJ50kqgAnQPFUaq4 cmUDQ4sXVcWHDR30EfEnj75QvB+5gDFMvVkyBcSdhOobz/PuqH2umx4Q3nXeuR8n9jRq uSd+joy4W+5fZC7/Nfp2Rjiu9zCf9mQauJLmDr+Zw6JMHw5qptDaqa4uFKu/7hVfm3qm Y8dS1E9ZWHI6eqigiUBt7Z/MX/V47KSheZ5jZLBue8j5uD+6luURncjqeUIksGSSITSg HTuRPma4wlewW5NeByaczqNKwSy1TnQb8jGhyekGQuOwirjtz0XfSi5EshC4E+mB5NxU xF5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=EmHLU+la; 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 wg11-20020a17090705cb00b0078d6418dcb8si9339726ejb.456.2022.11.07.00.48.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Nov 2022 00:48:31 -0800 (PST) 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=EmHLU+la; 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 D97673857412 for ; Mon, 7 Nov 2022 08:44:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D97673857412 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1667810646; bh=i5M1vXD6A4TdiPKeS19lsiIwlchrRmKfBXb1c+PKIzU=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=EmHLU+las59SH9vux7c0o5qSuG4CxBJetw9k4bSItdohlLYMpGxa3/0+N5lw7340f oLyjhXX+yHVEYRUnFAqAWN8KGvgsKs6GTBw9mf7XHF+ltjLm0dEG4UoGcztmpk+fVS 36lEGW8q+/wKPgNug/N6E1rt07Qu0suAC/Ke2w4g= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by sourceware.org (Postfix) with ESMTPS id 395F6385AC30 for ; Mon, 7 Nov 2022 08:40:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 395F6385AC30 Received: by mail-wm1-x32a.google.com with SMTP id o30so6402176wms.2 for ; Mon, 07 Nov 2022 00:40:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=i5M1vXD6A4TdiPKeS19lsiIwlchrRmKfBXb1c+PKIzU=; b=Ra8cmyrtPdg3zNHBF7TcZDvRlgsvbX8NIiqRffQbW4l1au6usVgjuv8OzgkH1AMDGG FQTu5N+zAo/4zsaJ+vEgKf3BG+1J4z3umb4YCsbXLmn0mq2DLLggWpnKVfsFLIZ+RIGo Ixg3c9dluIbsV2wc9MCXRY9EnIi+mCcSIqR/9GYYWCfBsefvkyr/epCQLkE0igsR20kG dRgvIM2BzNoh5ETrjOp1UxEH5vAGPaFIcASCs8Vdr3iHrr89Q/QMUFnpZITqpeeusjAm dYgB0qDbukwFAWAQz0KpJycvO6MqJv1sJjMVg8x/KxJX+W5pxdtJd5sbfa0EU4gNQx/X /lWw== X-Gm-Message-State: ACrzQf3mXHnTqvYjP6HPyIlhlApeEQQbOUsMHO5PsrZdyawxlEwFAIdp A3bSjSg5TCaaVXMTr/AicuBOYUhbax4JnQ== X-Received: by 2002:a05:600c:15d6:b0:3cf:8e4b:957e with SMTP id v22-20020a05600c15d600b003cf8e4b957emr14774998wmf.118.1667810437037; Mon, 07 Nov 2022 00:40:37 -0800 (PST) Received: from poulhies-Precision-5550.lan (static-176-191-105-132.ftth.abo.bbox.fr. [176.191.105.132]) by smtp.gmail.com with ESMTPSA id h13-20020a05600016cd00b002322bff5b3bsm8000733wrf.54.2022.11.07.00.40.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Nov 2022 00:40:36 -0800 (PST) To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED] ada: Flip warning suppression routine to positive meaning Date: Mon, 7 Nov 2022 09:40:34 +0100 Message-Id: <20221107084034.151239-1-poulhies@adacore.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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?1748826493977486239?= X-GMAIL-MSGID: =?utf-8?q?1748826493977486239?= From: Piotr Trojanek Subprogram names starting with No_ seem unnecessarily confusing. Cleanup related to improved detection of references to uninitialized objects; semantics is unaffected. gcc/ada/ * sem_warn.adb (Warn_On_In_Out): Remove No_ prefix; flip return values between True and False; adapt caller. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_warn.adb | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/gcc/ada/sem_warn.adb b/gcc/ada/sem_warn.adb index a1a59a8857b..9dccf0d73d1 100644 --- a/gcc/ada/sem_warn.adb +++ b/gcc/ada/sem_warn.adb @@ -2971,7 +2971,7 @@ package body Sem_Warn is procedure Output_Non_Modified_In_Out_Warnings is - function No_Warn_On_In_Out (E : Entity_Id) return Boolean; + function Warn_On_In_Out (E : Entity_Id) return Boolean; -- Given a formal parameter entity E, determines if there is a reason to -- suppress IN OUT warnings (not modified, could be IN) for formals of -- the subprogram. We suppress these warnings if Warnings Off is set, or @@ -2980,11 +2980,11 @@ package body Sem_Warn is -- context may force use of IN OUT, even if the parameter is not -- modified for this particular case). - ----------------------- - -- No_Warn_On_In_Out -- - ----------------------- + -------------------- + -- Warn_On_In_Out -- + -------------------- - function No_Warn_On_In_Out (E : Entity_Id) return Boolean is + function Warn_On_In_Out (E : Entity_Id) return Boolean is S : constant Entity_Id := Scope (E); SE : constant Entity_Id := Spec_Entity (E); @@ -2995,7 +2995,7 @@ package body Sem_Warn is if Address_Taken (S) or else (Present (SE) and then Address_Taken (Scope (SE))) then - return True; + return False; -- Do not warn if used as a generic actual, since the generic may be -- what is forcing the use of an "unnecessary" IN OUT. @@ -3003,19 +3003,19 @@ package body Sem_Warn is elsif Used_As_Generic_Actual (S) or else (Present (SE) and then Used_As_Generic_Actual (Scope (SE))) then - return True; + return False; -- Else test warnings off on the subprogram elsif Warnings_Off (S) then - return True; + return False; -- All tests for suppressing warning failed else - return False; + return True; end if; - end No_Warn_On_In_Out; + end Warn_On_In_Out; -- Start of processing for Output_Non_Modified_In_Out_Warnings @@ -3030,12 +3030,7 @@ package body Sem_Warn is -- Suppress warning in specific cases (see details in comments for -- No_Warn_On_In_Out). - if No_Warn_On_In_Out (E1) then - null; - - -- Here we generate the warning - - else + if Warn_On_In_Out (E1) then -- If -gnatwk is set then output message that it could be IN if not Is_Trivial_Subprogram (Scope (E1)) then