From 727e4d37be92715947de468ebf26b4f1cddc2e66 Mon Sep 17 00:00:00 2001 From: Piotr Trojanek Date: Tue, 9 Jul 2019 07:54:55 +0000 Subject: [PATCH] [Ada] Exp_Util: minor refactoring 2019-07-09 Piotr Trojanek gcc/ada/ * exp_util.adb (Containing_Package_With_Ext_Axioms): Replace low-level Ekind test with a high-level wrapper. From-SVN: r273285 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/exp_util.adb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 3832b31eaad..b89bb8ff3f9 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2019-07-09 Piotr Trojanek + + * exp_util.adb (Containing_Package_With_Ext_Axioms): Replace + low-level Ekind test with a high-level wrapper. + 2019-07-09 Arnaud Charlet * libgnat/s-memory.adb: Disable calls to Abort defer/undefer diff --git a/gcc/ada/exp_util.adb b/gcc/ada/exp_util.adb index 9769d684922..f13108092b5 100644 --- a/gcc/ada/exp_util.adb +++ b/gcc/ada/exp_util.adb @@ -4492,7 +4492,7 @@ package body Exp_Util is begin -- E is the package or generic package which is externally axiomatized - if Ekind_In (E, E_Generic_Package, E_Package) + if Is_Package_Or_Generic_Package (E) and then Has_Annotate_Pragma_For_External_Axiomatization (E) then return E; -- 2.30.2