From patchwork Tue Jun 20 07:47:07 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: 110312 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3497243vqr; Tue, 20 Jun 2023 00:56:46 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7rckA3V3f5I0sIjTvJVz/H2wOTgXr0lSIA8yQ7h7m3+cdG/E38Jd3JfcucdqpKtX/4aPKG X-Received: by 2002:a17:907:987:b0:987:6372:c31f with SMTP id bf7-20020a170907098700b009876372c31fmr7284127ejc.37.1687247806711; Tue, 20 Jun 2023 00:56:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687247806; cv=none; d=google.com; s=arc-20160816; b=kujAYNVlMpp6I7rstybXcHSBuKGm7lCJB6AWP1/LxlyV9Ev1In8S+ZWv0sitBC4PJl Ofl9oqFOasqnHj2odBi1hSzxeAV13IlIvBWkTSxhyrmhhCI6p5cExZ3mX1MDgVQ/XZD9 fLYbh+HgxKNoGMG6cL8B5ZisHEeItdtO6yKECCZun4NNUcOwmYAkBZ+qsyBpg9i4QEcH +/RwKWh0l0JEi9aNves0E+c1rKOYv5Hm9gnvTBF/Nr6kcKe7nzPuHKfb8dbz+32QXXkA 1Yldhn0w2MbXKPlA3M3KrwVMlkvjv0EaSrJW3dgXc90uP6RhuqDxsLQ4FTuOTAKjiSh7 +KJg== 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=CQqSXy27UqYPcZyB2yg6Sa1sL5tYR4HSCHqn+lbAy6Y=; b=K66jFf53c7MK8bkW3HOCoVzj7dRtb+zBqo4AbzBw0IRlrWss0ssP0JCUv+cXX8y6FB n+RM789Ba59FXc4y0s07PN0xzK9O1VCuohhXWYp/scvqswdYAnAfV+GCtwX1pVCns+1c bnCaXvQu7h7D9vjx9ELFzgwtrNlrL/OUfSHHoiH5cfRumLzGcGeyD3K/wWleHMi7aAi7 sdeM2JqgpuESqdhhUA/iOf3JzQiS4JIx1jy8+YMlbZ287o1N6Q3WZLWHEi2eohEnaiSf 4QkB2n8vu+79M+/D1CiZuKwJYUVwMWugLC6mXE9KFToRevb16dZvUIPZM2x0FaUOFRMd lUUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=o06RTbMl; 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 w3-20020a170906480300b009889b69c1edsi820531ejq.697.2023.06.20.00.56.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 00:56:46 -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=o06RTbMl; 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 480C9389EC5B for ; Tue, 20 Jun 2023 07:51:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 480C9389EC5B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1687247501; bh=CQqSXy27UqYPcZyB2yg6Sa1sL5tYR4HSCHqn+lbAy6Y=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=o06RTbMlkInGViE2UG8BOdXekQ7foJxb1UES/cBGb+cJoAmbRdgpNAqeYbkazriXm mbBNwlOdKuJgdm0c3FNHp8qYW+/bQZk3B8CjRh9Ll0q99PGxKcRbhfJ2Gvb1HC4FM6 GImkiWDF5WlerKzrSsEI7hKiM5DHFlt9u9Bku6Fw= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by sourceware.org (Postfix) with ESMTPS id CAE4F3857B9B for ; Tue, 20 Jun 2023 07:47:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CAE4F3857B9B Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-3f909853509so22949535e9.3 for ; Tue, 20 Jun 2023 00:47:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687247228; x=1689839228; 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=CQqSXy27UqYPcZyB2yg6Sa1sL5tYR4HSCHqn+lbAy6Y=; b=bA9vku6aI6MSMWkiquQiJeWcfKq7Q+NFVDR/hcRVWpfqton2FOljwmU8Nq+nUdTHf6 icIkmWGliQFxUz30uSjlJBSZSuacWFuiC5DID1o64zMbJwFA7fL9VRdZwo4vuoDuGBAu HOTtx/pLithqxdHY8dcAvXbG31evk04/tSaSAGgpmpOR8G8nvtTGW7rmRV8t8YITrBM9 B2iy4uETE4S8bmGkfyRuhZPqcRw0tyD2v91LCebImsHNNvlBBtNLunTY580/OqJq9l+B 25/cBviK+9ExvU+h5pmolo981ZFC9qSgtH5c76/3kky0AVU9ZjkVnokVKKNv87id0MlC GyiQ== X-Gm-Message-State: AC+VfDzjAWXyxdTCeE/HKuXlerY1T9LVWMdD6pJ+S2TLja92T25LSH0X 4jDI0FSX7D0lMxQ/2mxefPtx4HrtAtSts49/AXYDoQ== X-Received: by 2002:a1c:f70a:0:b0:3f7:34dc:ed0d with SMTP id v10-20020a1cf70a000000b003f734dced0dmr8259383wmh.25.1687247228641; Tue, 20 Jun 2023 00:47:08 -0700 (PDT) Received: from poulhies-Precision-5550.lan ([2001:861:3382:1a90:4c16:36ea:1b76:c001]) by smtp.gmail.com with ESMTPSA id l17-20020a05600012d100b002c71b4d476asm1304563wrx.106.2023.06.20.00.47.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 00:47:08 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED] ada: Fix for quantified expressions in Exceptional_Cases Date: Tue, 20 Jun 2023 09:47:07 +0200 Message-Id: <20230620074707.1253060-1-poulhies@adacore.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.7 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?1769207556389599635?= X-GMAIL-MSGID: =?utf-8?q?1769207556389599635?= From: Piotr Trojanek When detecting illegal uses of formal parameters of the current subprogram in contract of its Exceptional_Cases, we relied on the Current_Scope. However, quantified expressions introduce an implicit scope, which we need to take into account. gcc/ada/ * sem_res.adb (Resolve_Entity_Name): Ignore implicit loop scopes introduced by quantified expressions. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_res.adb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb index 266cf8e559e..6867c8f1275 100644 --- a/gcc/ada/sem_res.adb +++ b/gcc/ada/sem_res.adb @@ -8116,7 +8116,7 @@ package body Sem_Res is -- data from the object. if Ekind (E) in E_Out_Parameter | E_In_Out_Parameter - and then Scope (E) = Current_Scope + and then Scope (E) = Current_Scope_No_Loops and then Within_Exceptional_Cases_Consequence (N) and then not In_Attribute_Old (N) and then not (Nkind (Parent (N)) = N_Attribute_Reference