@@ -1704,16 +1704,16 @@ package body Restrict is
--------------------------------
procedure Violation_Of_No_Dependence (Unit : Int; N : Node_Id) is
+ Unit_Node : constant Node_Id := No_Dependences.Table (Unit).Unit;
begin
- Error_Msg_Node_1 := No_Dependences.Table (Unit).Unit;
- Error_Msg_Sloc := Sloc (Error_Msg_Node_1);
+ Error_Msg_Sloc := Sloc (Unit_Node);
if No_Dependences.Table (Unit).Warn then
- Error_Msg
- ("?*?violation of restriction `No_Dependence '='> &`#", Sloc (N));
+ Error_Msg_NE ("?*?violation of restriction `No_Dependence '='> &`#",
+ N, Unit_Node);
else
- Error_Msg
- ("|violation of restriction `No_Dependence '='> &`#", Sloc (N));
+ Error_Msg_NE ("|violation of restriction `No_Dependence '='> &`#", N,
+ Unit_Node);
end if;
end Violation_Of_No_Dependence;
From: Ronan Desplanques <desplanques@adacore.com> This patch tweaks the calls made to Errout subprograms to report violations of dependence restrictions, in order fix a crash that occurred with -gnatdJ and -fdiagnostics-format=json. gcc/ada/ * restrict.adb (Violation_Of_No_Dependence): Tweak error reporting calls. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/restrict.adb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)