diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2012-10-05 16:26:27 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2012-10-05 16:26:27 +0200 |
| commit | 967fb65e809daa9c8d5a233dab77dd5e61d8effc (patch) | |
| tree | 2c59e16f45cb06bdd0078f6acdcad19653f91c17 /gcc/ada/sem_util.adb | |
| parent | 60b68e56cecc0af3e14698ba66e620c2eb76705c (diff) | |
| download | gcc-967fb65e809daa9c8d5a233dab77dd5e61d8effc.zip gcc-967fb65e809daa9c8d5a233dab77dd5e61d8effc.tar.gz gcc-967fb65e809daa9c8d5a233dab77dd5e61d8effc.tar.bz2 | |
[multiple changes]
2012-10-05 Robert Dewar <dewar@adacore.com>
* sem_util.adb (Has_One_Matching_Field): Handle case of lone
discriminant.
2012-10-05 Yannick Moy <moy@adacore.com>
* checks.adb (Minimize_Eliminate_Overflow_Checks): Correct code
for the division operation and exponent operation. Adjust bound
for the mod and rem operations.
From-SVN: r192126
Diffstat (limited to 'gcc/ada/sem_util.adb')
| -rw-r--r-- | gcc/ada/sem_util.adb | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 2202c88..1c9eb64 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -13622,7 +13622,9 @@ package body Sem_Util is function Has_One_Matching_Field return Boolean; -- Determines if Expec_Type is a record type with a single component or -- discriminant whose type matches the found type or is one dimensional - -- array whose component type matches the found type. + -- array whose component type matches the found type. In the case of + -- one discriminant, we ignore the variant parts. That's not accurate, + -- but good enough for the warning. ---------------------------- -- Has_One_Matching_Field -- @@ -13664,10 +13666,10 @@ package body Sem_Util is if No (E) then return False; - elsif (Ekind (E) /= E_Discriminant - and then Ekind (E) /= E_Component) + elsif not Ekind_In (E, E_Discriminant, E_Component) or else (Chars (E) = Name_uTag - or else Chars (E) = Name_uParent) + or else + Chars (E) = Name_uParent) then Next_Entity (E); @@ -13679,7 +13681,10 @@ package body Sem_Util is if not Covers (Etype (E), Found_Type) then return False; - elsif Present (Next_Entity (E)) then + elsif Present (Next_Entity (E)) + and then (Ekind (E) = E_Component + or else Ekind (Next_Entity (E)) = E_Discriminant) + then return False; else |