OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Ada] Make Is_OK_Static_Subtype use Is_Static_Subtype

Browse Source 
gcc/ada/

	* sem_eval.adb (Is_OK_Static_Subtype): Call Is_Static_Subtype,
	remove redundant checks.
This commit is contained in:
Ghjuvan Lacambre 2021-01-13 18:03:15 +01:00 committed by Pierre-Marie de Rodat
parent a86fbc250c
commit 1075946d06
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gcc/ada/sem_eval.adb
View File

@ -5549,23 +5549,16 @@ package body Sem_Eval is
return False;
end if;
Anc_Subt := Ancestor_Subtype (Typ);
-- Then, check if the subtype is strictly static. This takes care of
-- checking for generics and predicates.
if Anc_Subt = Empty then
Anc_Subt := Base_T;
if not Is_Static_Subtype (Typ) then
return False;
end if;
if Is_Generic_Type (Root_Type (Base_T))
or else Is_Generic_Actual_Type (Base_T)
then
return False;
elsif Has_Dynamic_Predicate_Aspect (Typ) then
return False;
-- String types
elsif Is_String_Type (Typ) then
if Is_String_Type (Typ) then
return
Ekind (Typ) = E_String_Literal_Subtype
or else
@ -5579,6 +5572,12 @@ package body Sem_Eval is
return True;
else
Anc_Subt := Ancestor_Subtype (Typ);
if No (Anc_Subt) then
Anc_Subt := Base_T;
end if;
-- Scalar_Range (Typ) might be an N_Subtype_Indication, so use
-- Get_Type_{Low,High}_Bound.