public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r13-3789] ada: Improve handling of declare expressions in deferred-freezing contexts
@ 2022-11-08  8:41 Marc Poulhi?s
  0 siblings, 0 replies; only message in thread
From: Marc Poulhi?s @ 2022-11-08  8:41 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:f2fa41b442ae6b6ab1fbde82d31abcd986b9f1f3

commit r13-3789-gf2fa41b442ae6b6ab1fbde82d31abcd986b9f1f3
Author: Steve Baird <baird@adacore.com>
Date:   Wed Oct 19 12:42:55 2022 -0700

    ada: Improve handling of declare expressions in deferred-freezing contexts
    
    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.

Diff:
---
 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,

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-11-08  8:41 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-08  8:41 [gcc r13-3789] ada: Improve handling of declare expressions in deferred-freezing contexts Marc Poulhi?s

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).