From patchwork Fri May 26 07:36:20 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: 99369 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp294874vqr; Fri, 26 May 2023 00:52:52 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ46kjmMIvXSMSr4WW/7rty7SdZaGfJl70syelBg4UAW94xL6dzNEpMdbnhaX0ywTI910OQc X-Received: by 2002:a17:907:72cc:b0:973:8198:bbf6 with SMTP id du12-20020a17090772cc00b009738198bbf6mr1190097ejc.3.1685087572111; Fri, 26 May 2023 00:52:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685087572; cv=none; d=google.com; s=arc-20160816; b=oM62uXL+yDs27ob/igjUknlbDtnfSSVn/I+phReRE9EQboADKN3ezzRQS6D9weoSkL EHkw6BwXDc7nZxQTwWbq8G1xRk5syo67P1NfluhdMWcglcx/pvB6i57mtTfI92LMTR1A odYCd/aybXq3moPDTtVdZWRCJJBuVwp45xv4Wgb6lAku5BQU5vhih/8yJTMVkG4pBn85 gaeMHoA64CwrnHkomq+AyCwwlbN2n6m7WXAtM69eWioho9b3jT/qugJkGbv6u5uq4uFI rrH0dNlfwgHGWU2SOuk8eDkN4kkFEvbY3W9qt0q8Ue3N2O6v0HcMLF9OFv0a7YdU5ULN sQDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=sCeivSk7y0lD+MSmRMTfw6xQKuyJRcz04Ulh0iDcxPg=; b=QaAgbazzAWEWkcs+jfJQYhy4wSWcj5BG8BkQvpjjQ9aC7CmhsSY7bbUByvZKqHUDNq d7t2O0By2eKoY9jdFP9xQ/2pns81VioQg12WbPf3CqHsO7mGYtZrw98bSFQp/9Uv7g17 dftcEHTTNdsjrzlB5UZ3koLKP+sKrq0DbtbN7nAOCrUWjPcZMEbHkPmDdTF96I/XsZns O32833DSkmvOadVLLtT4SvE6eCjNAnMfP3/ihCX6ntu4589SHUrvBka+Ii+NnVa/sn0Y 0jwmCHx7hm/wykZ1aGx80d8pSE+pod/11E4esCg7JFz66FkbT7J4EjASQP2VL+/WjT1J DzSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=Dmba4Oz4; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 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. [8.43.85.97]) by mx.google.com with ESMTPS id 25-20020a170906319900b0096a6f453937si2371897ejy.803.2023.05.26.00.52.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 May 2023 00:52:52 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=Dmba4Oz4; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 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 601AD3AA8026 for ; Fri, 26 May 2023 07:43:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 601AD3AA8026 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1685087015; bh=sCeivSk7y0lD+MSmRMTfw6xQKuyJRcz04Ulh0iDcxPg=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=Dmba4Oz4Jw1CgLyEFuNHJC4v0dRgGpXYgX+jDtVNKQ6RlN7+8+CUaHImVJLxB6EsA nV1phn9LytpTANpXMxXndqbwstK2Hr++9Q3LPKqJQCJ+J/TXjNiYkjzvUEjn7piucu skbjLSovx3haMH7XwHY/Ix2Kpm1NXvEI1no3AYLo= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by sourceware.org (Postfix) with ESMTPS id A46613852771 for ; Fri, 26 May 2023 07:36:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A46613852771 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-3f6d7abe9a4so2816465e9.2 for ; Fri, 26 May 2023 00:36:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685086582; x=1687678582; 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=sCeivSk7y0lD+MSmRMTfw6xQKuyJRcz04Ulh0iDcxPg=; b=Es1N7ow2bKeyoQDXGPnDRmehsczE26D2xRGZWQs4hT66jTKVS/wsHHXYrwHyXfXFyY l9oW5bbeoTg+pEe0ll1lchvLBU63z5lf0yIzSp78ou4JE98Js3gtIZIM0FZK7RaihNCE ancr8qKJ5Gj9MzzCk0r6fKOlmhP3cjJw4XP40/VH0mGt65wuwAp7DBpPkVh89YwUjq10 J1TU0AJFxS5zEAYFvZIL1kjAzOj9MR2WrWEvTvX/NleqDIZIq8/9P2amZqHjPpILGRXq +1FrJU5nV4QPDuMwqjdqP8GEvj2JxT9vzHWmpqMGy6RzS0EBUWGK/sQ2c/LNJCjCyU/N 4rtw== X-Gm-Message-State: AC+VfDyaqJ8OLi8SQ7p/1zvc2S8uYiKQRiGaWyy5zjPlbDxj4s6IV1a1 xmpNNMcooLbZFq+/Ib3L1rg9pyh3GEF1+EC82pCw4w== X-Received: by 2002:a1c:ed0e:0:b0:3f6:451:63bc with SMTP id l14-20020a1ced0e000000b003f6045163bcmr713403wmh.2.1685086582478; Fri, 26 May 2023 00:36:22 -0700 (PDT) Received: from localhost.localdomain ([2001:861:3382:1a90:777b:eef4:6f79:f26f]) by smtp.gmail.com with ESMTPSA id m8-20020a7bce08000000b003f17af4c4e0sm7932408wmc.9.2023.05.26.00.36.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 May 2023 00:36:21 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED] ada: Simplify iteration over record component items with possible pragmas Date: Fri, 26 May 2023 09:36:20 +0200 Message-Id: <20230526073620.2068944-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+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766942385870863673?= X-GMAIL-MSGID: =?utf-8?q?1766942385870863673?= From: Piotr Trojanek Code cleanup; semantics is unaffected. gcc/ada/ * sem_util.adb (Is_Null_Record_Definition): Use First_Non_Pragma and Next_Non_Pragma to ignore pragmas within component list. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_util.adb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 64c12cc7ecf..e11eded398d 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -18699,19 +18699,17 @@ package body Sem_Util is return True; end if; - Item := First (Component_Items (Component_List (Record_Def))); + Item := First_Non_Pragma (Component_Items (Component_List (Record_Def))); while Present (Item) loop if Nkind (Item) = N_Component_Declaration and then Is_Internal_Name (Chars (Defining_Identifier (Item))) then null; - elsif Nkind (Item) = N_Pragma then - null; else return False; end if; - Item := Next (Item); + Next_Non_Pragma (Item); end loop; return True;