[gcc r14-4275] ada: Fix deferred constant wrongly rejected

Marc Poulhi?s dkm@gcc.gnu.org
Tue Sep 26 11:46:17 GMT 2023


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

commit r14-4275-gf6367fc211e52b3f7f8d0f2c481e20cb69839071
Author: Eric Botcazou <ebotcazou@adacore.com>
Date:   Sat Sep 16 20:29:20 2023 +0200

    ada: Fix deferred constant wrongly rejected
    
    This recent regression occurs when the nominal subtype of the constant is a
    discriminated record type with default discriminants.
    
    gcc/ada/
            PR ada/110488
            * sem_ch3.adb (Analyze_Object_Declaration): Do not build a default
            subtype for a deferred constant in the definite case too.

Diff:
---
 gcc/ada/sem_ch3.adb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb
index 92902a7debb..c79d323395f 100644
--- a/gcc/ada/sem_ch3.adb
+++ b/gcc/ada/sem_ch3.adb
@@ -5048,9 +5048,11 @@ package body Sem_Ch3 is
             Apply_Length_Check (E, T);
          end if;
 
-      --  When possible, build the default subtype
+      --  When possible, and not a deferred constant, build the default subtype
 
-      elsif Build_Default_Subtype_OK (T) then
+      elsif Build_Default_Subtype_OK (T)
+        and then (not Constant_Present (N) or else Present (E))
+      then
          if No (E) then
             Act_T := Build_Default_Subtype (T, N);
          else


More information about the Gcc-cvs mailing list