From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 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-x330.google.com with SMTP id 5b1f17b1804b1-3f909853509so22949535e9.3 for ; Tue, 20 Jun 2023 00:47:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1687247228; x=1689839228; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=CQqSXy27UqYPcZyB2yg6Sa1sL5tYR4HSCHqn+lbAy6Y=; b=e2YNNwR1YiH643N+5lXIGehp5FOypaKj+pri1KaKMxCq0PC+mBitKC2n3kPXljz6e1 /pN7rnfLQZcX8c6mPtNTDCw6ckbSQZloBBCMO/k4SEMYMk/e3NAABSEjMnlWHAFBEEY5 bPjYB/YnO7g/DPMhkpEFRL2KwmffQFWPeoSTrPN9lU8ua5Cd59NQkINsG7y5307AuCfp giZEIsntWWNPlUpW7LDaT3DSe2UnNjMtOFLT7zgUUgM+Z5RtZXKgk8uiWAa5TAMJx/DZ i17QvNqi+PL17RCBCltftgdXwItq1vf384vlPHlHNVbfo9y8xaJxKGtuJD83Jd5PQJNR 7keQ== 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-Google-Smtp-Source: ACHHUZ444EYfDqxvZGAxqWoW5WcGtFODfiPAHAZ/76hEh9kqZixZYmeQmYS7Ar2YPjzeglI6IN1AMg== 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) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= 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 Content-Transfer-Encoding: 8bit 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 List-Id: 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 -- 2.40.0