diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2017-04-27 11:57:00 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2017-04-27 11:57:00 +0200 |
| commit | b63d61f7d1256c255013af6ea4b0f64bdd6d7340 (patch) | |
| tree | e3ecd4e087cb6d587db234fbb131aea9674974c6 /gcc/ada/sem_eval.adb | |
| parent | bb9e2aa27576a5dc46bc679949309de4c1600132 (diff) | |
| download | gcc-b63d61f7d1256c255013af6ea4b0f64bdd6d7340.zip gcc-b63d61f7d1256c255013af6ea4b0f64bdd6d7340.tar.gz gcc-b63d61f7d1256c255013af6ea4b0f64bdd6d7340.tar.bz2 | |
[multiple changes]
2017-04-27 Hristian Kirtchev <kirtchev@adacore.com>
* a-cofuse.adb, a-cfdlli.adb, a-cofuse.ads, a-cfdlli.ads, a-cofuve.adb,
a-cofuve.ads, a-cofuma.adb, a-cofuma.ads, sem_eval.adb, a-cofuba.adb:
Minor reformatting.
2017-04-27 Ed Schonberg <schonberg@adacore.com>
* sem_ch4.adb (Analyze_Call): If the return type of a function
is incomplete in an context in which the full view is available,
replace the type of the call by the full view, to prevent spurious
type errors.
* exp_disp.adb (Check_Premature_Freezing): Disable check on an
abstract subprogram so that compiler does not reject a parameter
of a primitive operation of a tagged type being frozen, when
the untagged type of that parameter cannot be frozen.
2017-04-27 Bob Duff <duff@adacore.com>
* sem_attr.adb (Compute_Type_Key): Don't walk
representation items for irrelevant types, which could be in a
different source file.
2017-04-27 Steve Baird <baird@adacore.com>
* exp_attr.adb (Expand_N_Attribute_Reference):
Don't expand Image, Wide_Image, Wide_Wide_Image attributes
for CodePeer.
From-SVN: r247305
Diffstat (limited to 'gcc/ada/sem_eval.adb')
| -rw-r--r-- | gcc/ada/sem_eval.adb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gcc/ada/sem_eval.adb b/gcc/ada/sem_eval.adb index e024c6d..24e0963 100644 --- a/gcc/ada/sem_eval.adb +++ b/gcc/ada/sem_eval.adb @@ -630,17 +630,17 @@ package body Sem_Eval is -- to discrete and non-discrete types. elsif (Nkind (Choice) = N_Subtype_Indication - or else (Is_Entity_Name (Choice) - and then Is_Type (Entity (Choice)))) + or else (Is_Entity_Name (Choice) + and then Is_Type (Entity (Choice)))) and then Has_Predicates (Etype (Choice)) and then Has_Static_Predicate (Etype (Choice)) then if Is_Discrete_Type (Etype (Choice)) then - return Choices_Match - (Expr, Static_Discrete_Predicate (Etype (Choice))); + return + Choices_Match + (Expr, Static_Discrete_Predicate (Etype (Choice))); - elsif - Real_Or_String_Static_Predicate_Matches (Expr, Etype (Choice)) + elsif Real_Or_String_Static_Predicate_Matches (Expr, Etype (Choice)) then return Match; |