From patchwork Fri May 26 07:36:41 2023 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: 70150 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A91CA388CF65 for ; Fri, 26 May 2023 07:48:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A91CA388CF65 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1685087311; bh=RwqAJsos9QbZVvo+N/QTjDiuep4GC/93S1tN8+ButFQ=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=R0L7xV95FTAB6E2kFZ8sdup+pORZESJP/GA1nrsg8AaxmR+AUidC11DIBNfvPFDfJ oLDIlyL3doFN/W6Af4VLvShK7iS9pSdc1/odgFxuZyuNQFDVL79fEe5o6ynSPO5jhA Z+/rZ1xMivOp5Gu1pwX7PNx+QGWOTRCrlXQtFtPA= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by sourceware.org (Postfix) with ESMTPS id 0F4313857716 for ; Fri, 26 May 2023 07:36:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0F4313857716 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-3f68fc6b479so4782965e9.2 for ; Fri, 26 May 2023 00:36:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685086603; x=1687678603; 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=RwqAJsos9QbZVvo+N/QTjDiuep4GC/93S1tN8+ButFQ=; b=Xzc+PQkQUo1EoS8zh39pWd5F04LJRTeCBlZtokCRBL0Vmqz8XrLJWjkG5OARAgD+Na Aps156l+4sljA0vjaronZs1DV7nwwFmLu5JFZoQkQgM0oOzWiYA8PnbyFE1I3HOS7YjR /GC4x/mwhzRuN4ITYFwsKeY461WmMHfdcKWGoXszNjsOw9zi2RnM+107sP2Ds0l7OLZN anOfRGXXSs/Aer0Z55PHi8bEzbklwbLoNI5UO/qMbjDNsxzzcFRvqTmIbr2p1N67e5VK LWHUuvdCvxPioayfodd/BsPz3zMS5nJlvqaxoYlL9PQ/c/5/uGQnEbt8G0e1x9Tbjw9Y cx8Q== X-Gm-Message-State: AC+VfDw3/o0JsW8WJotw8MZs/SDISOKSk7kg52G6nVtPoTvjGWK+iWzR 6i2iCeNn8xeq7Oc0ZG41TmaIglaXhlMf52m2LJlRGA== X-Google-Smtp-Source: ACHHUZ59FFMwgiC/Uc1+vVu6i3RdtESwHktpuvtDy/HzPrw/5Cwc6hQEurGxKYbWDzV35EI4CDcR3w== X-Received: by 2002:a7b:c45a:0:b0:3f4:2506:3d58 with SMTP id l26-20020a7bc45a000000b003f425063d58mr692586wmi.23.1685086602946; Fri, 26 May 2023 00:36:42 -0700 (PDT) Received: from localhost.localdomain ([2001:861:3382:1a90:777b:eef4:6f79:f26f]) by smtp.gmail.com with ESMTPSA id k15-20020a05600c0b4f00b003f611b2aedesm4264140wmr.38.2023.05.26.00.36.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 May 2023 00:36:42 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED] ada: Remove redundant guard against empty lists Date: Fri, 26 May 2023 09:36:41 +0200 Message-Id: <20230526073641.2069598-1-poulhies@adacore.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 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 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+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" From: Piotr Trojanek There is no need to guard against routine Contains being called on No_Elist, because it will return False. Code cleanup related to handling of primitive operations in GNATprove; semantics is unaffected. gcc/ada/ * sem_prag.adb (Record_Possible_Body_Reference): Remove call to Present. * sem_util.adb (Find_Untagged_Type_Of): Likewise. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_prag.adb | 4 +--- gcc/ada/sem_util.adb | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb index 96ea17209f3..5363d2bee80 100644 --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -32644,9 +32644,7 @@ package body Sem_Prag is if Nkind (Context) = N_Package_Body then Spec_Id := Corresponding_Spec (Context); - if Present (Abstract_States (Spec_Id)) - and then Contains (Abstract_States (Spec_Id), State_Id) - then + if Contains (Abstract_States (Spec_Id), State_Id) then if No (Body_References (State_Id)) then Set_Body_References (State_Id, New_Elmt_List); end if; diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index e11eded398d..9d12ee71d93 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -6524,7 +6524,6 @@ package body Sem_Util is begin while Present (E) and then E /= Prim loop if not Is_Tagged_Type (E) - and then Present (Direct_Primitive_Operations (E)) and then Contains (Direct_Primitive_Operations (E), Prim) then return E;