From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by sourceware.org (Postfix) with ESMTPS id F1DF43858D28 for ; Thu, 29 Sep 2022 09:10:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org F1DF43858D28 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-wm1-x331.google.com with SMTP id fn7-20020a05600c688700b003b4fb113b86so412056wmb.0 for ; Thu, 29 Sep 2022 02:10:40 -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; bh=wslPC0Jkrxu2kDIPWsA7Bzw2SVn8bEFKR5GFNIm8Kbk=; b=f2AaLmaEp7dJWGCCFojkK7fDOMvlpe9OT2ez1ZDh7QeTnZ20IbMs++rmYQZahFXSLL YVq3G1vsa5DHCc7u663PO8lcsHR5AHE5jzAcdBE9RweI8ZjV815pebQN4NDsbEbEVBIN m1T8hhtKTa9u3Fil5MJc6yngu8vJOQiwYyVRQ7b+TJ9mCJEvzZD9jwVIyHNzGEcvKIri xcxAiaccmTr4EaEZOQBgI6dPKKOUqvreW2y8FaMAcntDdo3oow5qwJEJEckSwu+5ApQ0 ADeyxsEdYCP9nqb7iLRCmnawK438krXg5uuEmLGijTrSQdR+NH2B1YI9JjsAF877hkDZ AXDg== 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; bh=wslPC0Jkrxu2kDIPWsA7Bzw2SVn8bEFKR5GFNIm8Kbk=; b=zKnbhkwuQQpG6BYdF+yfaxzzu3AJsV0k65e143lw9gaAo/1B3vPc9+LrTNVlAQniDW vVGZwbsDnZ6ruhYUq/XqYRikdmNMq+sHOJhby1HvrmjaeT2EyxdpziDiL3xXhsfxu8BZ Aapj6RIpMulJAhiJZOJJ6U2OqabJdkbEUQcTTT3ZdHbiiCmoCmIvhRR+XlJICN/x4HCZ XK7jjfmn2DqLn8uzSLxttqZNDfhMwo6PttgmP+nZtCMLGkRFfAfIHK6Sb3+jZm16h0aJ EALWZPNH49GS7ejS73PClK5MBsWzn9q9qLPeD/+m8x13y3gYA5iUTg9KQT+Usju+EOIm 9Yaw== X-Gm-Message-State: ACrzQf38qoKl5YJ5IHqEdyMjVJN6nZTgJi+DtF2rbqmw6O2TO1vtTm4K U+s3tzbE4adZK9sGB9qGogu1k6LMipOOyg== X-Google-Smtp-Source: AMsMyM4R/AjQlJ7T0v1nRFrUyLIBBStFqwyZMr4UsX2QgTyTb4QwyJ+C6mr410JTRjpIlMQlYYZQQw== X-Received: by 2002:a7b:c00d:0:b0:3b4:6331:2fc5 with SMTP id c13-20020a7bc00d000000b003b463312fc5mr9666495wmb.11.1664442639016; Thu, 29 Sep 2022 02:10:39 -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 z8-20020a1cf408000000b003b56be51313sm3296148wma.44.2022.09.29.02.10.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 02:10:38 -0700 (PDT) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITED] ada: Fix checking of Refined_State with nested package renamings Date: Thu, 29 Sep 2022 11:10:21 +0200 Message-Id: <20220929091021.359477-1-poulhies@adacore.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.0 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 collecting package state declared in package body, we should only recursively examine the visible part of nested packages while ignoring other entities related to packages (e.g. package bodies or package renamings). gcc/ada/ * sem_util.adb (Collect_Visible_States): Ignore package renamings. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_util.adb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 9ae082ca2e1..25e886e1ca1 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -6018,8 +6018,11 @@ package body Sem_Util is Append_New_Elmt (Item_Id, States); -- Recursively gather the visible states of a nested package + -- except for nested package renamings. - elsif Ekind (Item_Id) = E_Package then + elsif Ekind (Item_Id) = E_Package + and then No (Renamed_Entity (Item_Id)) + then Collect_Visible_States (Item_Id, States); end if; -- 2.25.1