The reason for this change is two-fold:
- There is code duplication between Is_OK_Static_Subtype and
Is_Static_Subtype
- Is_Static_Subtype is more correct than Is_OK_Static_Subtype (e.g. the
dynamic predicate checks are more complete in Is_Static_Subtype).
Tested on x86_64-pc-linux-gnu, committed on trunk
gcc/ada/
* sem_eval.adb (Is_OK_Static_Subtype): Call Is_Static_Subtype,
remove redundant checks.diff --git a/gcc/ada/sem_eval.adb b/gcc/ada/sem_eval.adb
--- a/gcc/ada/sem_eval.adb
+++ b/gcc/ada/sem_eval.adb
@@ -5549,23 +5549,16 @@ package body Sem_Eval is
return False;
end if;
- Anc_Subt := Ancestor_Subtype (Typ);
-
- if Anc_Subt = Empty then
- Anc_Subt := Base_T;
- end if;
+ -- Then, check if the subtype is strictly static. This takes care of
+ -- checking for generics and predicates.
- 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
+ if not Is_Static_Subtype (Typ) then
return False;
+ end if;
-- 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.
