From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7871) id 15EA13858C5E; Tue, 20 Jun 2023 07:46:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 15EA13858C5E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1687247161; bh=nGyQ08ZxS2zw9TlF0H3i3e1bDcqIVau77ybg1Jp5oM8=; h=From:To:Subject:Date:From; b=PemyHhuy7ld2XRxayyrN6VA7EXS+V08dZ0xNJRm8ZCwMXPU61kZ2+zMrwp4Cx+NBt ikN2qj8OmGDxSrot2BrIvcsC3QSIllKASdH6gls5KvIIztBNknTQx8dtVWkbvPFB45 4twXepmYzzu5geuJVs9o5S8/sidTyXunBXiXdbds= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Marc Poulhi?s To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-1963] ada: Pass Error_Node to calls to Error_Msg in lib-load.adb X-Act-Checkin: gcc X-Git-Author: Ghjuvan Lacambre X-Git-Refname: refs/heads/master X-Git-Oldrev: b1c3d01619e06e7ef49097925b81307f422ec78a X-Git-Newrev: 2071134b54aa4f9af01d7d6212dacf7747168448 Message-Id: <20230620074601.15EA13858C5E@sourceware.org> Date: Tue, 20 Jun 2023 07:46:01 +0000 (GMT) List-Id: https://gcc.gnu.org/g:2071134b54aa4f9af01d7d6212dacf7747168448 commit r14-1963-g2071134b54aa4f9af01d7d6212dacf7747168448 Author: Ghjuvan Lacambre Date: Tue May 23 17:50:24 2023 +0200 ada: Pass Error_Node to calls to Error_Msg in lib-load.adb When not passing Error_Node, Error_Msg will treat Current_Node as the node attached to the message. When this happens in lib-load.adb due to a file that cannot be loaded, Current_Node might reference a node that doesn't actually exist. This is a problem when using -gnatdJ and -fdiagnostics-format, as in this case GNAT will attempt to retrieve information from the node attached to the message and thus crash when said node is invalid. gcc/ada/ * lib-load.adb (Load_Unit): Pass Error_Node to calls to Error_Msg. Diff: --- gcc/ada/lib-load.adb | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/gcc/ada/lib-load.adb b/gcc/ada/lib-load.adb index d79ee438243..72196b437f5 100644 --- a/gcc/ada/lib-load.adb +++ b/gcc/ada/lib-load.adb @@ -645,11 +645,16 @@ package body Lib.Load is if Is_Predefined_File_Name (Fname) then Error_Msg_Unit_1 := Uname_Actual; Error_Msg - ("$$ is not a language defined unit", Load_Msg_Sloc); + ("$$ is not a language defined unit", + Load_Msg_Sloc, + Error_Node); else Error_Msg_File_1 := Fname; Error_Msg_Unit_1 := Uname_Actual; - Error_Msg ("file{ does not contain unit$", Load_Msg_Sloc); + Error_Msg + ("file{ does not contain unit$", + Load_Msg_Sloc, + Error_Node); end if; Write_Dependency_Chain; @@ -697,7 +702,8 @@ package body Lib.Load is end if; if Present (Error_Node) then - Error_Msg ("circular unit dependency", Load_Msg_Sloc); + Error_Msg + ("circular unit dependency", Load_Msg_Sloc, Error_Node); Write_Dependency_Chain; else Load_Stack.Decrement_Last; @@ -798,11 +804,14 @@ package body Lib.Load is then Error_Msg_File_1 := Unit_File_Name (Corr_Body); Error_Msg - ("cannot compile subprogram in file {!", Load_Msg_Sloc); + ("cannot compile subprogram in file {!", + Load_Msg_Sloc, + Error_Node); Error_Msg_File_1 := Unit_File_Name (Unum); Error_Msg ("\incorrect spec in file { must be removed first!", - Load_Msg_Sloc); + Load_Msg_Sloc, + Error_Node); Unum := No_Unit; goto Done; end if; @@ -879,15 +888,21 @@ package body Lib.Load is Error_Msg_Unit_1 := Uname_Actual; Error_Msg -- CODEFIX - ("$$ is not a predefined library unit", Load_Msg_Sloc); + ("$$ is not a predefined library unit", + Load_Msg_Sloc, + Error_Node); else Error_Msg_File_1 := Fname; if Src_Ind = No_Access_To_Source_File then - Error_Msg ("no read access to file{", Load_Msg_Sloc); + Error_Msg + ("no read access to file{", + Load_Msg_Sloc, + Error_Node + ); else - Error_Msg ("file{ not found", Load_Msg_Sloc); + Error_Msg ("file{ not found", Load_Msg_Sloc, Error_Node); end if; end if;