From d60f61f6a42171b5be920ba1217a94c2e8d15241 Mon Sep 17 00:00:00 2001 From: Gary Dismukes <dismukes@adacore.com> Date: Sat, 9 Jul 2022 19:16:51 -0400 Subject: [PATCH] [Ada] Fix for bootstrap problem with calling function System.Case_Util.To_Mixed gcc/ada/ * sem_ch13.adb (Check_And_Resolve_Storage_Model_Type_Argument): Call the System.Case_Util.To_Mixed procedure rather than the function, to avoid bootstrap problems. --- gcc/ada/sem_ch13.adb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb index 9c3ae6fe33d0..a64a3cd90de9 100644 --- a/gcc/ada/sem_ch13.adb +++ b/gcc/ada/sem_ch13.adb @@ -17376,9 +17376,11 @@ package body Sem_Ch13 is Argument_Id : in out Entity_Id; Nam : Name_Id) is - Name_String : constant String := To_Mixed (Get_Name_String (Nam)); + Name_String : String := Get_Name_String (Nam); begin + To_Mixed (Name_String); + if Present (Argument_Id) then Error_Msg_String (1 .. Name_String'Length) := Name_String; Error_Msg_Strlen := Name_String'Length; -- GitLab