diff options
| author | Piotr Trojanek <trojanek@adacore.com> | 2021-04-08 21:17:33 +0200 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2021-06-29 14:23:47 +0000 |
| commit | df3636e013f276a0d1fde5b6da1f504b748696db (patch) | |
| tree | ee7209e09267005a9705793dba89e84f18569bbf /gcc/ada | |
| parent | 3307a681fe6883008495d686f3b357dcbfb9537c (diff) | |
| download | gcc-df3636e013f276a0d1fde5b6da1f504b748696db.zip gcc-df3636e013f276a0d1fde5b6da1f504b748696db.tar.gz gcc-df3636e013f276a0d1fde5b6da1f504b748696db.tar.bz2 | |
[Ada] Reuse Is_Subprogram_Or_Entry where possible
gcc/ada/
* freeze.adb (Freeze_All): Simplify by reusing
Is_Subprogram_Or_Entry.
* sem_ch11.adb (Analyze_Handled_Statement): Likewise.
Diffstat (limited to 'gcc/ada')
| -rw-r--r-- | gcc/ada/freeze.adb | 2 | ||||
| -rw-r--r-- | gcc/ada/sem_ch11.adb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb index 3ea4a99..81e0e87 100644 --- a/gcc/ada/freeze.adb +++ b/gcc/ada/freeze.adb @@ -2179,7 +2179,7 @@ package body Freeze is elsif Is_Concurrent_Type (E) then Item := First_Entity (E); while Present (Item) loop - if (Is_Entry (Item) or else Is_Subprogram (Item)) + if Is_Subprogram_Or_Entry (Item) and then not Default_Expressions_Processed (Item) then Process_Default_Expressions (Item, After); diff --git a/gcc/ada/sem_ch11.adb b/gcc/ada/sem_ch11.adb index 5a2c6a6..2af65ae 100644 --- a/gcc/ada/sem_ch11.adb +++ b/gcc/ada/sem_ch11.adb @@ -435,7 +435,7 @@ package body Sem_Ch11 is -- postcondition, since in that case there are no source references, and -- we need to preserve deferred references from the enclosing scope. - if ((Is_Subprogram (Current_Scope) or else Is_Entry (Current_Scope)) + if (Is_Subprogram_Or_Entry (Current_Scope) and then Chars (Current_Scope) /= Name_uPostconditions) or else Ekind (Current_Scope) in E_Block | E_Task_Type then |