From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 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-x32a.google.com with SMTP id o30so6402176wms.2 for ; Mon, 07 Nov 2022 00:40:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=i5M1vXD6A4TdiPKeS19lsiIwlchrRmKfBXb1c+PKIzU=; b=L13SsAkiDdAYcqauiwxhELbUl6h8qaqtW8/ZQmDoglWO21F5FdCUJu8nuyeERGEC25 9WTK6dvWcaFISRBeFyKo20k8AHsMBWq4vZrV9MEDsdKjCDAWl3aFd+U27+UvtDbsRcE/ t1plx9nLirHKAszh34stYcIulFqD2cjTQ2exj+rLiBfvn5D3Bz/E/vR+hR2z+ZW4jGlE lZdtD0Y60mNhsOX2F016pLdKcYR7kvtdbZZz9mYp+5fccJG7aJWtuAEupKUZW+P7AGAm 5W4ksgZmf7OPT7/VqkZxR7Q6KjcihQJ48LdxtuieoB0aHQrAHJacvZZBJbEzusO73U8B F3WA== 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-Google-Smtp-Source: AMsMyM5vmFWWIoRHumi5kX948lQPT0RweMAUS3uOTsK5407l6xPGBzCxTpN5LGgDnYpCe+QY4Xw9HQ== 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) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= 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 Content-Transfer-Encoding: 8bit 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 List-Id: 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 -- 2.34.1