From: Raphaël AMIARD <ami...@adacore.com>
gcc/ada/ChangeLog:
* sem_ch13.adb (Analyze_One_Aspect): change the call to
`Error_Msg_GNAT_Extension` to allow this aspect in core
extensions. Put the code path in core extensions.
* exp_util.adb (Name_Of_Controlled_Prim_Op): Put the code path
in core extensions
Tested on x86_64-pc-linux-gnu, committed on master.
---
gcc/ada/exp_util.adb | 2 +-
gcc/ada/sem_ch13.adb | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/gcc/ada/exp_util.adb b/gcc/ada/exp_util.adb
index 8b9ce9a2acc..400d5d86fba 100644
--- a/gcc/ada/exp_util.adb
+++ b/gcc/ada/exp_util.adb
@@ -11574,7 +11574,7 @@ package body Exp_Util is
-- The aspect Finalizable may change the name of the primitives when
-- present, but it's a GNAT extension.
- if All_Extensions_Allowed then
+ if Core_Extensions_Allowed then
declare
Rep : constant Node_Id :=
Get_Rep_Item (Typ, Name_Finalizable, Check_Parents => True);
diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb
index 953da67c9d3..11545771030 100644
--- a/gcc/ada/sem_ch13.adb
+++ b/gcc/ada/sem_ch13.adb
@@ -4073,9 +4073,10 @@ package body Sem_Ch13 is
end if;
when Aspect_Finalizable =>
- if not All_Extensions_Allowed then
+ if not Core_Extensions_Allowed then
Error_Msg_Name_1 := Nam;
- Error_Msg_GNAT_Extension ("aspect %", Loc);
+ Error_Msg_GNAT_Extension
+ ("aspect %", Loc, Is_Core_Extension => True);
goto Continue;
elsif not Is_Type (E) then
--
2.43.0
