From patchwork Mon Sep 15 13:01:07 2025 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: 120257 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 953AD385DC05 for ; Mon, 15 Sep 2025 13:04:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 953AD385DC05 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=eIgatmMN X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by sourceware.org (Postfix) with ESMTPS id 4C5A3385694A for ; Mon, 15 Sep 2025 13:01:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4C5A3385694A Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 4C5A3385694A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::42a ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1757941312; cv=none; b=H6J/8u2EOBIv6dyhqOeVfDqYG+cQ37yYOYwpO2JqjUGMGi2XCtXvQhY+Aeg2mLhpnZZWjZ9tZfbc2iHiPA6gqWO+JNMAh+IXpqWFB3gHLvLyrgJKeyfwegJFQsInVCGXwp4WEkcL1ADnA2hASJr/l5FqBK2ICf7YIoCQUMad5Dc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1757941312; c=relaxed/simple; bh=UMGtKhfvgC1zp3OJHnd3gTAYM1iZaoEwjfeirCRa8/U=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Pp3mzf0icm9lW6weh40RwLxI/Ae66584SCx3A6elORbmR4Qy5q+1vEtU7fn+RccYNvPxaYNYYWlU66/W2X+inbpCeU1a0JBl8ifyVrQaduxTP/7WnwsViYdp3dNVXkAGLoIqR33yEr3JySUtnrDHCVuR9oJwFb79RiQXKAhj9S8= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4C5A3385694A Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-3df15fdf0caso3357103f8f.0 for ; Mon, 15 Sep 2025 06:01:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1757941311; x=1758546111; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=98WFmgC1ISghQN+aNIrIGW2rvoJTmAPmmctVuySZKJM=; b=eIgatmMNLcwa5YJXTOWRTmG9wI0qO6E9xVi8M2sNEZf2uSDL67DbRsMebpVnU/oasS 60CG6ozLUfehdh2UBb4O9CZwW61ba1p5oEAexxUUNlQ+ySnEuMJXM2gzO5zsRs/JKw88 d4jEU3tfkcRiV/tYu2PmaJy3Q06Qa9z03L7214XfdpMbzXrs9T/ELj9HVJ+P9mU5kv/O 5mgUg6df7SRsVE4RnPYkG7ZiSJYwcEzOhqfxpoZY2N+F+vAQXJl8+9t7UvbtrqhDmyQJ TOXuYoTWQmv/+g8yvBseD7eQMJpc2PGBKRJqZkCFKBt783in+MVlj3J+t1/zVFPqPNUg d8RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757941311; x=1758546111; 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=98WFmgC1ISghQN+aNIrIGW2rvoJTmAPmmctVuySZKJM=; b=oo2lgPQCu3NeComNYCHMKN/hBb0oQ1m/OzpIj4TZ1gv1Phs+D0/hdvgfoAuT/IlOTG DigDOYy/AVvCsihUTBQhdUkLRO4HVEiULzkT2reW6nAesr4bOYP+Ge9hJw3JkIdiI2Fl e7fhq8it0Ji+ZFYN/Th8u14GyLj4XZazwmY0Rkd59Tc0ctHlMTTCq1IER7slnOS+/b5H f+XlsjGWsq/7jy3ffR/6UHaiVZput2bbmfqhpDDEcclDfGssYwW7xhcitH/hz2jWpHnp kP6nPprNLjruTOl3fZ/s7/hyn4YZvSl+PvHGk5XnyuZUEMysBhz+QIp+1zdVTmU/InO1 9R4w== X-Gm-Message-State: AOJu0Yyx0hutyjJ9+2zc3v5jK1u81CTYuYt2mOb5c0IS9sQg/ZBrvLh4 6ZK5Ip35XRwBVsNDeOY5BE9jZcVJStBqlsqhD6Z+jhaAaWnNgXQT5zN9T4eGeIcDcq5u5Xl2szz wtIQ= X-Gm-Gg: ASbGncvKAKbL+ymze1qHZUGs92yKTci22kIk+LcTfno11SubGdyrD/b7UYVLF0KYWu/ spQyDLgjeTlEkGupnSsnBndd1qWQZsmoiR3bcQquZAjBRXIiRUEw1GM5jTUzZq6DkRDThUDj59A QzgicsRN2RLM5DeWRaCRXGzz2UVshCJIsYgvuiLl/bkrbZwEd87DifOX7jByuPKkHBg6ADGQqSg ovyBZ2ESz8NFL4MKUpD0x1jQgHyF2dbowzYR2e4XkbCuiVZ2REwE6PR2FLwrm8o/oN0Ez/kjNDt Bm84j32hDA7BT96xT69Kx7VoWcLAlBQztxxqZav0fuHjxNGDlGh7pXJ82lH6j75PoQYEJFhPoy9 pf4iEGfgORSsozV4+5IoU48Y5Ta7YB527tpi4TRBOFWS975/rQHrVuusfPWV3rPXt8g61Jr3tno Ajw8NdZn/MiZREaQks28zIGOFHE5FWKegz3seouQ== X-Google-Smtp-Source: AGHT+IEfuYUfrBAob6bCyfrS0icqxOzTG0p1f2VF8sZ6ZDnVoasEkyAETFkCnTNV9mIyiSAIsVHnJg== X-Received: by 2002:a05:6000:4029:b0:3ea:71c4:8e1b with SMTP id ffacd0b85a97d-3ea71c49295mr3628624f8f.63.1757941309548; Mon, 15 Sep 2025 06:01:49 -0700 (PDT) Received: from poulhies-Precision-5550.telnowedge.local (lmontsouris-659-1-24-67.w81-250.abo.wanadoo.fr. [81.250.175.67]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3ea4b52b7fcsm5428733f8f.33.2025.09.15.06.01.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Sep 2025 06:01:49 -0700 (PDT) From: =?utf-8?q?Marc_Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Ronan Desplanques Subject: [COMMITTED 01/27] ada: Fix documentation of Is_Ancestor_Package Date: Mon, 15 Sep 2025 15:01:07 +0200 Message-ID: <20250915130135.2720894-1-poulhies@adacore.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.8 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~patchwork=sourceware.org@gcc.gnu.org From: Ronan Desplanques "Is_Ancestor_Package (E, E)" returns True and this patch fixes a comment that claimed otherwise. This patch also renames an object local to Is_Ancestor_Package that was misleadingly named "Par", a common abbreviation of "Parent". gcc/ada/ChangeLog: * sem_util.ads (Is_Ancestor_Package): Fix documentation comment. * sem_util.adb (Is_Ancestor_Package): Rename local object. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_util.adb | 8 ++++---- gcc/ada/sem_util.ads | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 8a3998d7d123..432b036396d7 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -15991,14 +15991,14 @@ package body Sem_Util is (E1 : Entity_Id; E2 : Entity_Id) return Boolean is - Par : Entity_Id := E2; + Cursor : Entity_Id := E2; begin - while Present (Par) and then Par /= Standard_Standard loop - if Par = E1 then + while Present (Cursor) and then Cursor /= Standard_Standard loop + if Cursor = E1 then return True; end if; - Par := Scope (Par); + Cursor := Scope (Cursor); end loop; return False; diff --git a/gcc/ada/sem_util.ads b/gcc/ada/sem_util.ads index 04caed575065..88a1841cb389 100644 --- a/gcc/ada/sem_util.ads +++ b/gcc/ada/sem_util.ads @@ -1849,7 +1849,7 @@ package Sem_Util is function Is_Ancestor_Package (E1 : Entity_Id; E2 : Entity_Id) return Boolean; - -- True if package E1 is an ancestor of E2 other than E2 itself + -- True if package E1 is an ancestor of E2 function Is_Atomic_Object (N : Node_Id) return Boolean; -- Determine whether arbitrary node N denotes a reference to an atomic