From 1019e23137b0e05c0cae1959ded69cba9466f3b5 Mon Sep 17 00:00:00 2001 From: Ghjuvan Lacambre Date: Fri, 14 Aug 2020 11:34:06 +0200 Subject: [PATCH] [Ada] Fix error message for import aspect gcc/ada/ * sem_prag.adb (Process_Convention, Process_Import_Or_Interface): Fix error message. --- gcc/ada/sem_prag.adb | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb index ba867231685..4c7131accf1 100644 --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -8270,8 +8270,13 @@ package body Sem_Prag is -- Accept Intrinsic Export on types if Relaxed_RM_Semantics if not (Is_Type (E) and then Relaxed_RM_Semantics) then - Error_Pragma_Arg - ("second argument of pragma% must be a subprogram", Arg2); + if From_Aspect_Specification (N) then + Error_Pragma_Arg + ("entity for aspect% must be a subprogram", Arg2); + else + Error_Pragma_Arg + ("second argument of pragma% must be a subprogram", Arg2); + end if; end if; -- Special checks for C_Variadic_n @@ -9543,10 +9548,17 @@ package body Sem_Prag is Process_Import_Predefined_Type; else - Error_Pragma_Arg - ("second argument of pragma% must be object, subprogram " - & "or incomplete type", - Arg2); + if From_Aspect_Specification (N) then + Error_Pragma_Arg + ("entity for aspect% must be object, subprogram " + & "or incomplete type", + Arg2); + else + Error_Pragma_Arg + ("second argument of pragma% must be object, subprogram " + & "or incomplete type", + Arg2); + end if; end if; -- If this pragma applies to a compilation unit, then the unit, which -- 2.30.2