[Ada] Remove dead code from Enclosing_Package_Or_Subprogram routine

Calls to Scope always return unique entities, i.e. package/subprogram
and not their bodies, so there is no need to expect them.

Cleanup only; semantics unaffected. (This routine was only used in CCG
and GNATprove backends anyway.)

2019-07-08  Piotr Trojanek  <trojanek@adacore.com>

gcc/ada/

	* sem_util.adb (Enclosing_Package_Or_Subprogram): Do not expect
	package and subprogram bodies.

From-SVN: r273222

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 7641688ec7d61601c663c1f5581f23b29b74bc9e..d38dce0f9eb376b876c739bee26a93ed6cdb426b 100644 (file)
--- 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 67bc4de39c43ca572bc789590953f080d0f2228c..0d4ec9cebf1c4ae1daa636a6fc92d64676b261cd 100644 (file)
--- 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;