From patchwork Fri Nov 4 13:57:21 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: 15553 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp424277wru; Fri, 4 Nov 2022 07:07:38 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5yZXmOvDhI0wvlWHY8x7kwo6N3HI1ZfmzKwh2wPY91x5pnnAXpMC1TZ/sZKgyGgbdvEHyN X-Received: by 2002:a17:907:6d9d:b0:7ad:f514:794e with SMTP id sb29-20020a1709076d9d00b007adf514794emr17933078ejc.602.1667570857999; Fri, 04 Nov 2022 07:07:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667570857; cv=none; d=google.com; s=arc-20160816; b=rAkXdYBka0DqnHqgr9bAxG36Q3Kjeh/jZ3ZbdqgRbl1mdEbV4r48HO/ZmrPCCmKf3p e1Va3y2SFqZHlRWHjI9pJvLAkiDNTXu7Q6oti//EZv8rKpF6ncPKDOqkX8PyY2+Ci670 XJPALXw1ERHZ6O6R/Yz+NRMPYwGH7Zn8agFQM4jXPAa8WVpfbXuwQXyGF+HSuGEYAHcL fzvt3m8zzZSLJPsNF2nQ2iInSOGGxiRRMX9hEd42VuOzRpg/DAuztrs3q+K2G3QIXOH5 NQJ8HbRcDi9Mnia/zfUvlWHwwfpcICKkjQ3ufy+8iEunvU6eootv4Kk8m5KSluzvWQNO YfwA== 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=m81mhfEk3crQLSIuP+XOYvXedU7U7pcnNWJ1/+qEnaM=; b=ay9XNVepfFeC5ChVTlQlbaHMIRc1+VIHX7nHRYdEvwnm6t/VwD3si6TkhKZiqQrNlv zM1B5eQRicOA+s6wJUFsuDaJhNGFP6KxQdfmWAwW46bm+o6Uv4wi22MFnKL75+NkXnsH DUBfLuRf1R5ph3vGHcVk43UbnuTgvdDsG00yWLzMeN8ovrOd2fFstwALy3z8jh7GjuRG 6du8wxZIfaPT8PRQWxGXVLSJCAMqky2L30dZtrlqBBX/v9V+WL6eMNL6REhEZc1eK964 4Wd/vNo4CwRM+KGorFxx75LlJChkMvOJ9FdUkVk9UMhIpy2CgH9ze1JfohC+GSaeh5VR jD1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=mLorT3RL; 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 hq10-20020a1709073f0a00b0078d459a1ce9si5865570ejc.693.2022.11.04.07.07.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Nov 2022 07:07:37 -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=mLorT3RL; 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 488D2385769F for ; Fri, 4 Nov 2022 14:01:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 488D2385769F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1667570488; bh=m81mhfEk3crQLSIuP+XOYvXedU7U7pcnNWJ1/+qEnaM=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=mLorT3RLEj6dAG1/AbcxOQRpIDuexhbkkX/QB1qWzKxy61hadW4kTKE8RZhcsbc3D mtkoctzKUj3kdn/LxBnR6B/MXGqyR1cComnYNFX9mdh/o4OIWKPVPB2jWaRKn6HoC6 H5dQ5nOOIOb55yVDQTEHmFEx42LlfNwp7cfs37m4= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by sourceware.org (Postfix) with ESMTPS id 146643858291 for ; Fri, 4 Nov 2022 13:57:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 146643858291 Received: by mail-wr1-x436.google.com with SMTP id h9so7232951wrt.0 for ; Fri, 04 Nov 2022 06:57:26 -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=m81mhfEk3crQLSIuP+XOYvXedU7U7pcnNWJ1/+qEnaM=; b=dfHC/TePX5spuLaI3CEmm8s4P9k5ZWnzeDdpNv5YHY2gr7j6RIrF2jQOD7J/PL1xKs rOzre+Mh6z+vFr8iGSQRaXPKJ6QdTvrjnPEgCdO/sNtg3k7f6JAXdj21eDNT/x5MyWLn pmZlp96plFKlKiX6SB3sExMn9bzHiPRNEW+3NNzwgm2Zzpb1a6pcHeTUMw2lqRUwHnhP 2NWvUsi2YI7AhD+a4iZJbJav0D25R18Pe7WKN6DVvRGJgN5ymKXJHvQ9pIThjgRQPdf9 eObedRhb5M+DbapkXPQsqXpXHX4DEGtiMwi5yPuuWpDB7gneTKpTVlU8+bW2sW4k7F+T HEDQ== X-Gm-Message-State: ACrzQf1b5luIxExykKwRDZFRW8qUT29guPE3KUPyujWrPZqBNoIZaxJM U1vPuZyFMvvGVrJ3/VaciUKvo1hV7JpdsQ== X-Received: by 2002:adf:b612:0:b0:236:5d1f:143a with SMTP id f18-20020adfb612000000b002365d1f143amr21902505wre.364.1667570244991; Fri, 04 Nov 2022 06:57:24 -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 c3-20020a5d5283000000b002206203ed3dsm3461607wrv.29.2022.11.04.06.57.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Nov 2022 06:57:24 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [COMMITTED] ada: Simplify detection of controlling formals Date: Fri, 4 Nov 2022 14:57:21 +0100 Message-Id: <20221104135721.86383-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?1748574780413126272?= X-GMAIL-MSGID: =?utf-8?q?1748574780413126272?= From: Piotr Trojanek When detecting controlling formals we are only interested in formal parameters and not in other entities. gcc/ada/ * sem_ch6.adb (Controlling_Formal): Iterate with First/Next_Formal and not with First/Next_Entity. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_ch6.adb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb index 228adcff5cd..d28de10d3d6 100644 --- a/gcc/ada/sem_ch6.adb +++ b/gcc/ada/sem_ch6.adb @@ -10711,13 +10711,13 @@ package body Sem_Ch6 is E : Entity_Id; begin - E := First_Entity (Prim); + E := First_Formal (Prim); while Present (E) loop - if Is_Formal (E) and then Is_Controlling_Formal (E) then + if Is_Controlling_Formal (E) then return E; end if; - Next_Entity (E); + Next_Formal (E); end loop; return Empty;