diff options
| -rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/ada/sem_util.adb | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 7641688..d38dce0 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2019-07-08 Piotr Trojanek <trojanek@adacore.com> + + * sem_util.adb (Enclosing_Package_Or_Subprogram): Do not expect + package and subprogram bodies. + 2019-07-08 Bob Duff <duff@adacore.com> * doc/gnat_ugn/gnat_utility_programs.rst: Remove documentation diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 67bc4de..0d4ec9c 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -6924,12 +6924,7 @@ package body Sem_Util is S := Scope (E); while Present (S) loop if Is_Package_Or_Generic_Package (S) - or else Ekind (S) = E_Package_Body - then - return S; - - elsif Is_Subprogram_Or_Generic_Subprogram (S) - or else Ekind (S) = E_Subprogram_Body + or else Is_Subprogram_Or_Generic_Subprogram (S) then return S; |