diff options
author | Piotr Trojanek <trojanek@adacore.com> | 2021-02-12 00:11:03 +0100 |
---|---|---|
committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2021-06-15 06:19:33 -0400 |
commit | 903655af70232eee31e5d83c59a45fa4d9e9ab00 (patch) | |
tree | f5b8dafc5a15900ae5721187671f898032224da2 /gcc | |
parent | abcf5174979bcb91ac4c921eaa19a5b37f231ae4 (diff) | |
download | gcc-903655af70232eee31e5d83c59a45fa4d9e9ab00.zip gcc-903655af70232eee31e5d83c59a45fa4d9e9ab00.tar.gz gcc-903655af70232eee31e5d83c59a45fa4d9e9ab00.tar.bz2 |
[Ada] Fix detection of access-to-variable types
gcc/ada/
* sem_prag.adb: Fix typos in comments related to access types.
* sem_util.adb (Is_Access_Variable): Stronger condition.
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/ada/sem_prag.adb | 4 | ||||
-rw-r--r-- | gcc/ada/sem_util.adb | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb index 67b2f25..d52ad5c 100644 --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -2464,7 +2464,7 @@ package body Sem_Prag is if Global_Mode in Name_In_Out | Name_Output then - -- Constant of a access-to-variable type is a read-write + -- Constant of an access-to-variable type is a read-write -- item in procedures, generic procedures, protected -- entries and tasks. @@ -13431,7 +13431,7 @@ package body Sem_Prag is Arg1); end if; - -- Only other possibility is Access-to-class-wide type + -- Only other possibility is access-to-class-wide type elsif Is_Access_Type (Nm) and then Is_Class_Wide_Type (Designated_Type (Nm)) diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 2024682..c9a2c9f 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -15386,8 +15386,9 @@ package body Sem_Util is function Is_Access_Variable (E : Entity_Id) return Boolean is begin - return Is_Access_Object_Type (E) - and then not Is_Access_Constant (E); + return Is_Access_Type (E) + and then not Is_Access_Constant (E) + and then Ekind (Directly_Designated_Type (E)) /= E_Subprogram_Type; end Is_Access_Variable; ----------------------------- |