]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
ada: Crash checking accessibility level on private type
authorJustin Squirek <squirek@adacore.com>
Fri, 10 May 2024 11:18:01 +0000 (11:18 +0000)
committerMarc Poulhiès <poulhies@adacore.com>
Fri, 14 Jun 2024 07:34:18 +0000 (09:34 +0200)
This patch fixes an issue in the compiler whereby calculating a static
accessibility level on a private type with an access discriminant resulted
in a compile time crash when No_Dynamic_Accessibility_Checks is enabled.

gcc/ada/

* accessibility.adb:
(Accessibility_Level): Replace call Get_Full_View with call to
Full_View since Get_Full_View only works with incomplete types.

gcc/ada/accessibility.adb

index 47b3a7af10a59434500da31f4b5602a58e1fe74a..da4d1d9ce2e2c48077763bc980138afc7d0e071d 100644 (file)
@@ -2227,7 +2227,11 @@ package body Accessibility is
                   --  that of the type.
 
                   elsif Ekind (Def_Ent) = E_Discriminant then
-                     return Scope_Depth (Get_Full_View (Scope (Def_Ent)));
+                     return Scope_Depth
+                       (if Present (Full_View (Scope (Def_Ent))) then
+                           Full_View (Scope (Def_Ent))
+                        else
+                           Scope (Def_Ent));
                   end if;
                end if;