summaryrefslogtreecommitdiff
path: root/gcc/ada/sem_eval.adb
diff options
context:
space:
mode:
authorcharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2014-07-29 13:02:06 +0000
committercharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2014-07-29 13:02:06 +0000
commit5c6a579237cdc3b4514dabb75e438011201c662f (patch)
tree3d83be6d9e80b289bd87e7433e7c31576768ffb4 /gcc/ada/sem_eval.adb
parent99ed4b4ce96bec3446145e7c97dd173e7e8edd82 (diff)
downloadgcc-5c6a579237cdc3b4514dabb75e438011201c662f.tar.gz
2014-07-29 Robert Dewar <dewar@adacore.com>
* sem_aggr.adb, exp_ch5.adb, sem_ch5.adb, exp_util.adb, einfo.adb, einfo.ads, sem_util.adb, sem_attr.adb, sem_case.adb, sem_eval.adb, sem_eval.ads, sem_ch13.adb: General cleanup of static predicate handling. Change name of Discrete_Predicate to Discrete_Static_Predicate, and replace testing of the presence of this field by testing the flag Has_Static_Expression. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@213161 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/sem_eval.adb')
-rw-r--r--gcc/ada/sem_eval.adb5
1 files changed, 3 insertions, 2 deletions
diff --git a/gcc/ada/sem_eval.adb b/gcc/ada/sem_eval.adb
index 27e1d208585..57152ae1bdf 100644
--- a/gcc/ada/sem_eval.adb
+++ b/gcc/ada/sem_eval.adb
@@ -330,7 +330,7 @@ package body Sem_Eval is
-- types, so no need to make a special test for that).
if not (Has_Static_Predicate (Typ)
- and then Compile_Time_Known_Value (Expr))
+ and then Compile_Time_Known_Value (Expr))
then
return;
end if;
@@ -354,7 +354,7 @@ package body Sem_Eval is
-- If static predicate matches, nothing to do
- if Choices_Match (Expr, Static_Predicate (Typ)) = Match then
+ if Choices_Match (Expr, Static_Discrete_Predicate (Typ)) = Match then
return;
end if;
@@ -383,6 +383,7 @@ package body Sem_Eval is
("??expression fails predicate check on &", Expr, Typ);
end if;
end Check_Expression_Against_Static_Predicate;
+
------------------------------
-- Check_Non_Static_Context --
------------------------------