From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by sourceware.org (Postfix) with ESMTPS id 7D4A63860C3B for ; Thu, 5 Jan 2023 14:39:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7D4A63860C3B 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-wr1-x434.google.com with SMTP id d4so28353597wrw.6 for ; Thu, 05 Jan 2023 06:39:15 -0800 (PST) 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:message-id:reply-to; bh=9GnRCbJ6BfJivn/0vfUdsN22nWo4xOUEF+uUcPmY+YY=; b=KkDgHnj9FeNC9ENSGXlqVDM65W2JZRtUALi2a6s6xKV8ZeBeOr2lKQlgmQKKdb7Z+z cQ5oAuC4dqZxjH3QCxg/PhEtNcJ0MB4aP2VE+E9um0ZK1+aFokivBb8JozZI3fwJZHzf J3rypnX3zvJ1Yi4AQ6QNqHCwK25CvF35zWj3ulaV7YQDtRFYom1292+iFOJtz3fGE+/d aLR99vshc/hb5rT9eF0YXHrB175w0Dn+mXo593ugZBJFnEXBy3/nMZD4YUhMv3ol6MnZ 8yKSypStdAaGbC0YgZfFFiJqAqPEfwZn2DoHDZDbU3KVoLbbPNnUpYQLf0M13fZ96ALu EAqg== 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:message-id :reply-to; bh=9GnRCbJ6BfJivn/0vfUdsN22nWo4xOUEF+uUcPmY+YY=; b=JSK7hewaHw6ds/+jJabNvmQdxThOMbwj42rO7nNtHIIwbCMHT1CQZ+WtfY374wP0Pd +N9dyHrVFv5eq5Ptr6t5g0x/yJwj4n9co9jzXwI/TG8ZVYTg3+rukrKjUCvnH0X2qS1o hJgVP9QK3zsr+wDEgBDqmxNnuvMtYTLgIBH8WZdGYEUIi/dYw6nVtSURKskvq19o7CZc 0Z/MgbdhTnPamLkumWxAbnb6QjNDZkIWcDltkmfu62zxEJUVHDM13AJ8gVKWe1gZC3hU EzLUR0TkwYMIjkZCheyaek6KPggfk32Ka+b0kA6U/d1a++z/wgeKQLFk0I5Dv6I9iWy8 9P8w== X-Gm-Message-State: AFqh2kqzQW5i0dZXrvDA5Ub519e0RrEXij7Kk4boffMUZAGMgnZQqZOq ltSXbab58hQ48jrvZXn5Oi2H6zzyijNCuPiXZ2Y= X-Google-Smtp-Source: AMrXdXvFwBMZx6FrZLzX/MyXIDnXB342XFAScURJEvx/ESoZbkZvKp+oIu4sqz7ovYrcLR1PzdlTBw== X-Received: by 2002:adf:e346:0:b0:2ab:80b3:67b0 with SMTP id n6-20020adfe346000000b002ab80b367b0mr2952338wrj.61.1672929554330; Thu, 05 Jan 2023 06:39:14 -0800 (PST) Received: from poulhies-Precision-5550.lan (static-176-191-105-132.ftth.abo.bbox.fr. [176.191.105.132]) by smtp.gmail.com with ESMTPSA id q187-20020a1c43c4000000b003c6c182bef9sm3113740wma.36.2023.01.05.06.39.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Jan 2023 06:39:13 -0800 (PST) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Justin Squirek Subject: [COMMITTED] ada: Spurious error on Lock_Free protected type with discriminants Date: Thu, 5 Jan 2023 15:39:12 +0100 Message-Id: <20230105143912.155630-1-poulhies@adacore.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 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: Justin Squirek This patch corrects an issue in the compiler whereby unprefixed discriminants appearing in protected subprograms were unable to be properly resolved - leading to spurious resolution errors. gcc/ada/ * sem_ch8.adb (Set_Entity_Or_Discriminal): Verify we are actually resetting the entity field of a non-prefixed discriminant reference. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_ch8.adb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gcc/ada/sem_ch8.adb b/gcc/ada/sem_ch8.adb index 841076bbd01..fe89e1127ee 100644 --- a/gcc/ada/sem_ch8.adb +++ b/gcc/ada/sem_ch8.adb @@ -4891,14 +4891,16 @@ package body Sem_Ch8 is then null; - -- Don't replace the discriminant in strict preanalysis mode since - -- it can lead to errors during full analysis when the discriminant - -- gets referenced later. + -- Don't replace a non-qualified discriminant in strict preanalysis + -- mode since it can lead to errors during full analysis when the + -- discriminant gets referenced later. -- This can occur in situations where a protected type contains - -- an expression function which references a discriminant. + -- an expression function which references a non-prefixed + -- discriminant. - elsif Preanalysis_Active + elsif No (P) + and then Preanalysis_Active and then Inside_Preanalysis_Without_Freezing = 0 then null; -- 2.34.1