From patchwork Fri Nov 4 13:58:38 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: 15564 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp427821wru; Fri, 4 Nov 2022 07:12:56 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5Y7oNL5H0AXCLY7GvTSBMB+X8k04Wj8FmaOj0MhiILpqzrTY8NXP4Q4oh0j5ihPcFoyALo X-Received: by 2002:a05:6402:298d:b0:451:5fc5:d423 with SMTP id eq13-20020a056402298d00b004515fc5d423mr33477358edb.102.1667571176608; Fri, 04 Nov 2022 07:12:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667571176; cv=none; d=google.com; s=arc-20160816; b=FLdRqyoiARobWXD02EcMVpXpQ9ku8ypVR5wGq4vyPtSodQCoAB42PhE5HAKTghS9tq o6bvNSFEVga3iwBvpBMq4srSX8kAf62zmymSNGx5Za0EnSBoF7273Mo+9rX4671DRL1r Qma9uSaVGLWGN8cKSyoQET9MKbLvsIsOeCfVKZqdwwrAFlITd7dFNoI6Yg/zYsQTFCsi WEEO9fKwAsyrdudjfTCuaMjrc2b4NYSZ+QaR7+FdliH7cOewyhdQ6mcAGHcTLICXvvvY knQvU++zUdzyDRIxVAk5Hf3KOvxCkmVso95mYrQJbBpqwyNZNhJCM4A4er2w8xGlNAT9 vBkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=SCS5Vv3W6+KRP2U3U07cjXJY27VVtGrDMFJkMDsGJCk=; b=xM9pFPjlHIKCnKP9DUoBvZZ3EWHKCDDP7om25QorRg9GEmNvN0DVMr/tDui39ceYAX XwySW4pCsoYaRrl4S3bjnGyPOKTFaCEYtVTP01esveWjmxdHE1OyQcvr/0WpkFLNyoeK qIGArsWeSLpMJa4sCJvmIq/WvKXrMvTGWnD52/C7n/xXNzGGQQARtz0qM9SozglFoc51 L254G4yQ6RTY1ZhZAhcEc5XhpCF6xGKQnTk2DhugLpjToSqsvlUPF/kWxVnmj1u7a8Ca scrAcIoaFi8k5qUet7xGui/+kxgwAo7+1LGLhQOUzJgKnRwB5PPwcYlRIWJKuL4Ou9AH tFAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=aMhpwY66; 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 h8-20020a05640250c800b00462a87b0546si5939984edb.607.2022.11.04.07.12.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Nov 2022 07:12:56 -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=aMhpwY66; 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 4E0E1381E5FB for ; Fri, 4 Nov 2022 14:05:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4E0E1381E5FB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1667570744; bh=SCS5Vv3W6+KRP2U3U07cjXJY27VVtGrDMFJkMDsGJCk=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=aMhpwY66uoSbAQBBk1HJw1ZicFLxX8r8H2L2LOry+31F2wHa9pPb9cWCrNnl+/toM ke9A+E3xEvJm4gHuLtQvXaEl0zcpbpV3i7SCds5NA5Q4OlbJBDJII652kFPDeyWBt2 r2YDpisIgTEUwjFS5yJx15mU6rDYRkaVzUj+X4rY= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 Received: by mail-wr1-x431.google.com with SMTP id h9so7237792wrt.0 for ; Fri, 04 Nov 2022 06:58:42 -0700 (PDT) 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-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) To: gcc-patches@gcc.gnu.org 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 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 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?= Cc: Piotr Trojanek 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?1748575114186755938?= X-GMAIL-MSGID: =?utf-8?q?1748575114186755938?= 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