From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 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-x436.google.com with SMTP id h9so7232951wrt.0 for ; Fri, 04 Nov 2022 06:57:26 -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=m81mhfEk3crQLSIuP+XOYvXedU7U7pcnNWJ1/+qEnaM=; b=MHsxdeOP1pjyWhhAlS6rhD1cCrRqng5jjMtRCxELKQ8D9atj6KL1+12w5ixHCOLylP ArPJ8M3GvIQ4I3AkpCrUiauZjnboKtg69MIqeerQC7d42WVR1d6jzN9I3d6RAjCGubv1 JBzatHA5uJOFxRrO0T9emcHRP8CvzJ1mzyHbuGs8w9vnnzGCNFfk6adCdVQWa3RXamzM H/6ZkvXl3K/jA1psX/YAguzI9mEUyGhziUazkJZIEqemYHV5XO8HyPem5IrCLVRsHF0F pYKlOkNB3O2p++fov0MchhTOS+4or+AmAQA+27lb+zMxHPWFosMgfv4sfaRMxciMDk1W P3uw== 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-Google-Smtp-Source: AMsMyM57jy7xZm4eFV8Kt/MtP1iphBshL72jBBwSasKY+mBFptVTEjoGINk1B7mL9mzk4CTD8WIkrQ== 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) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek 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 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 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; -- 2.34.1