From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by sourceware.org (Postfix) with ESMTPS id 3F8A6385828C for ; Fri, 4 Nov 2022 13:58:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3F8A6385828C 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-wr1-x431.google.com with SMTP id h9so7237792wrt.0 for ; Fri, 04 Nov 2022 06:58:42 -0700 (PDT) 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=SCS5Vv3W6+KRP2U3U07cjXJY27VVtGrDMFJkMDsGJCk=; b=e2kgRAhcES4mGh/5YWIj3GKN/VNoEM9VNNrSsm40S6C8+wL/cEVMaUEKZZyW/ATFZw 7pynHOogvKtiz9oAokurviGiDxbLE3Xa9hUKiSVKVSCVLveqfAHhH23nQ8j2fvrUeXnA inXaZyZLC44Nqr3P1cNSaIOZ4E2N7fDNruWWqbPps7G6b/bRa+5pMTdHrVrB8GoGhAad d7jafOhBxHDsOLmvGynk8mV3tbslM9x27oTC4uV8MgDy9k0mnKA+Niw3ygc6EgJfpRGa Ml6ANs9ryZtiDrVq3IatYCOl7LRrbY5ZVA4yIAv7inr61JMrn8TphTg/1yjFKaDm1VjB EHvw== 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=SCS5Vv3W6+KRP2U3U07cjXJY27VVtGrDMFJkMDsGJCk=; b=310v/iYmZB22W8lPAl3MpFjEdf06xBtBcmfvoaZicKAYYahn/5/nBNSwzkIt71smEX zwCNGX/lH4T0dTBuSwHPB9Qi8vZuT6GDN7EmY3Wc5zPLM2QY4c8R2HgUVY5pkhkvHvso Nw0uVsNB3DQQs2+BIq4WQ4rvFxHCCJmQIY7eiBDjgi+ROug7sMoH7BAFmyjIh8uwxYW5 KIdIhZi4FJs6PDaHgbtp9tTnEEqZM/4QlzC6BtbZExJ/kh7lEogkb7+T23TJzGFb7dPT 86Qdp5c2u1qytMjR/W4vdxHtaCkUUlu71GyZ3M7MWhlL6PRl2hJCpl1m1+1P7VAbM+Si Ogbg== X-Gm-Message-State: ACrzQf0ykP+3SP/nnalLKxx/CoOSqw7wc2lMQAr3+VnFbzHODWOYumVT 7ItxNjGgFcai31UY4tqRqq6HPfajIsy9Rg== X-Google-Smtp-Source: AMsMyM4teduqcW3XUEVFmk/A8LOqvShg2xUY1j4TZ3MXOUfXetYYNulGTbcKGRE6kuR4A2kVAhrT5g== X-Received: by 2002:a5d:6112:0:b0:236:740e:5938 with SMTP id v18-20020a5d6112000000b00236740e5938mr22082132wrt.155.1667570321915; Fri, 04 Nov 2022 06:58:41 -0700 (PDT) Received: from localhost.localdomain (static-176-191-105-132.ftth.abo.bbox.fr. [176.191.105.132]) by smtp.gmail.com with ESMTPSA id bj4-20020a0560001e0400b002322bff5b3bsm4424395wrb.54.2022.11.04.06.58.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Nov 2022 06:58:41 -0700 (PDT) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED] ada: Cleanup code for unreferenced variables Date: Fri, 4 Nov 2022 14:58:38 +0100 Message-Id: <20221104135838.87055-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.3 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 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 Further cleanups related to warnings about unreferenced objects. gcc/ada/ * sem_warn.adb (Check_References): Remove useless query for "spec" of a variable; refactor nested if-statements into a single condition. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_warn.adb | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/gcc/ada/sem_warn.adb b/gcc/ada/sem_warn.adb index 423754f5df8..a7f220bfbc7 100644 --- a/gcc/ada/sem_warn.adb +++ b/gcc/ada/sem_warn.adb @@ -1221,7 +1221,7 @@ package body Sem_Warn is elsif Warn_On_Constant and then Ekind (E1) = E_Variable and then Has_Initial_Value (E1) - and then Never_Set_In_Source_Check_Spec (E1) + and then Never_Set_In_Source (E1) and then not Generic_Package_Spec_Entity (E1) then -- A special case, if this variable is volatile and not @@ -1248,24 +1248,15 @@ package body Sem_Warn is -- Here we give the warning if referenced and no pragma -- Unreferenced or Unmodified is present. - else - -- Variable case - - if Ekind (E1) = E_Variable then - if Referenced_Check_Spec (E1) - and then not Has_Pragma_Unreferenced_Check_Spec (E1) - and then not Has_Pragma_Unmodified_Check_Spec (E1) - then - if not Warnings_Off_E1 - and then not Has_Junk_Name (E1) - then - Error_Msg_N -- CODEFIX - ("?k?& is not modified, " - & "could be declared constant!", - E1); - end if; - end if; - end if; + elsif Referenced (E1) + and then not Has_Unreferenced (E1) + and then not Has_Unmodified (E1) + and then not Warnings_Off_E1 + and then not Has_Junk_Name (E1) + then + Error_Msg_N -- CODEFIX + ("?k?& is not modified, could be declared constant!", + E1); end if; -- Other cases of a variable or parameter never set in source -- 2.34.1