aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorPiotr Trojanek <trojanek@adacore.com>2019-07-08 08:14:46 +0000
committerPierre-Marie de Rodat <pmderodat@gcc.gnu.org>2019-07-08 08:14:46 +0000
commit4fe5bbcf30a491a1722fa1752bc0ea9c32dcb2e3 (patch)
tree232380f00d2c3e2a498844de20e5b0c45076888d /gcc
parentb723426575b8a948947cd8b2403c4949edc92dfc (diff)
downloadgcc-4fe5bbcf30a491a1722fa1752bc0ea9c32dcb2e3.zip
gcc-4fe5bbcf30a491a1722fa1752bc0ea9c32dcb2e3.tar.gz
gcc-4fe5bbcf30a491a1722fa1752bc0ea9c32dcb2e3.tar.bz2
[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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ada/ChangeLog5
-rw-r--r--gcc/ada/sem_util.adb7
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;