From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id 966CE38515C3; Wed, 13 Jul 2022 10:03:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 966CE38515C3 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Pierre-Marie de Rodat To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-1669] [Ada] Fix for bootstrap problem with calling function System.Case_Util.To_Mixed X-Act-Checkin: gcc X-Git-Author: Gary Dismukes X-Git-Refname: refs/heads/master X-Git-Oldrev: 9f857be34d9c17730e590ee95d0d39953bc1bad4 X-Git-Newrev: d60f61f6a42171b5be920ba1217a94c2e8d15241 Message-Id: <20220713100352.966CE38515C3@sourceware.org> Date: Wed, 13 Jul 2022 10:03:52 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jul 2022 10:03:52 -0000 https://gcc.gnu.org/g:d60f61f6a42171b5be920ba1217a94c2e8d15241 commit r13-1669-gd60f61f6a42171b5be920ba1217a94c2e8d15241 Author: Gary Dismukes Date: Sat Jul 9 19:16:51 2022 -0400 [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. Diff: --- 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 9c3ae6fe33d..a64a3cd90de 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;