From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by sourceware.org (Postfix) with ESMTPS id 487DF385740F for ; Tue, 8 Nov 2022 08:42:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 487DF385740F 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-x436.google.com with SMTP id g12so19736888wrs.10 for ; Tue, 08 Nov 2022 00:42:49 -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=IlW00jTComnDqDzNFY4L0EtoAeEWxDDwQQDq6Hujp7Y=; b=XIhBOJnrEjUflayUtPyKjHjG3lca/itGcibhrkqTdvgwPHeUbEFzyHGQKIJY0EjXzj i3Pecuao3BGQAv3nn9lLkeX5tAFwYETMd7u38SgM7ZqVx73OqY3BPS2s/YVIpP8zh65Y lcFuSGuOc/3Qy5f5pKlY0vtjCmCrdBTVTFvhDNQauQKOsc4niS+cYFQiNyE4/zbMVUEl yQ91WqJa4dM3LcQnUEkk32RYvOBRguraw8qBAPAsCQIblZ+dRy4yZNfGMVSbPRWN6BGX 5APYzCmDHvbfL6boQUqkYbicM5bi2LuhFfe8BO5lEEpTPXptnplrFFjfogtDcj5H1Lqe ak6w== 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=IlW00jTComnDqDzNFY4L0EtoAeEWxDDwQQDq6Hujp7Y=; b=jP2nu9R2lOUm+nabvE4l+B8xD/xhcgpRtRkoPOWdh4ByesMGbQyiSGcJDMBnifpfZl FllV9uEt0tDf6FtIEEAE0PIdCIbrhFUwKfBwciUEzSDC8AAgVtp2srQwLH2VI90Lnfit 36cdCoTyL9mPHl630oiA+NsVGKgBWHBTvs2s8DgWdTu6l0Jc0w/vAMipex9PfGErNJf0 VJXpm0KWNzuS7bQuoInXYSpsLcGuy7L1LqVwz3caa4DIvA4h22IXsNhwi/8KqFeQHkfc dkA+cbOrZG4iCk5RUxjmkInqlwMvQGwRf4qAV883BuwVtpqkugMMoQNdJAPn8FtqsH3V CCzg== X-Gm-Message-State: ACrzQf0ZSpGOsjCMwG67u4XoRTyHBdRjWB85AqAOWLGF5rc2gofvLwej R8nW9zuMZroVXQZTN9qDqoPUZSo1BqULoQ== X-Google-Smtp-Source: AMsMyM5BpLiMSYV/O/vCxW3dHUGv/qeyJSzpAjlpDM6h9+aQfiQgM9baMB9cdQxx/mJaJ3kksLLISQ== X-Received: by 2002:a5d:4048:0:b0:236:659b:260e with SMTP id w8-20020a5d4048000000b00236659b260emr33127538wrp.445.1667896968114; Tue, 08 Nov 2022 00:42:48 -0800 (PST) Received: from localhost.localdomain (static-176-191-105-132.ftth.abo.bbox.fr. [176.191.105.132]) by smtp.gmail.com with ESMTPSA id v2-20020adfedc2000000b00228daaa84aesm9558147wro.25.2022.11.08.00.42.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Nov 2022 00:42:47 -0800 (PST) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Steve Baird Subject: [COMMITTED] ada: Improve handling of declare expressions in deferred-freezing contexts Date: Tue, 8 Nov 2022 09:42:44 +0100 Message-Id: <20221108084244.301581-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.4 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: Steve Baird In some cases where a declare expression occurs in a deferred-freezing context (e.g., within the default value for a discriminant or for a formal parameter, or within the expression of an expression function), the compiler generates a bugbox. gcc/ada/ * sem_ch3.adb (Analyze_Object_Declaration): Do not perform expansion actions if In_Spec_Expression is true. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_ch3.adb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb index 8f4e9f80eb8..95ffbe00ba4 100644 --- a/gcc/ada/sem_ch3.adb +++ b/gcc/ada/sem_ch3.adb @@ -4721,6 +4721,26 @@ package body Sem_Ch3 is Expand_Sliding_Conversion (E, T); end if; + if In_Spec_Expression and then In_Declare_Expr > 0 then + -- It is too early to be doing expansion-ish things, + -- so exit early. But we have to set Ekind (Id) now so + -- that subsequent uses of this entity are not rejected + -- via the same mechanism that (correctly) rejects + -- "X : Integer := X;". + + if Constant_Present (N) then + Mutate_Ekind (Id, E_Constant); + Set_Is_True_Constant (Id); + else + Mutate_Ekind (Id, E_Variable); + if Present (E) then + Set_Has_Initial_Value (Id); + end if; + end if; + + goto Leave; + end if; + Expand_Subtype_From_Expr (N => N, Unc_Type => T, -- 2.34.1