https://gcc.gnu.org/g:f03905788cbe2799a692b1f2435020b26a5a2574

commit r15-547-gf03905788cbe2799a692b1f2435020b26a5a2574
Author: Ronan Desplanques <desplanq...@adacore.com>
Date:   Mon Feb 19 11:17:51 2024 +0100

    ada: Fix crash with -gnatdJ and -gnatw_q
    
    This commit makes the emission of -gnatw_q warnings pass node information
    so as to handle the enclosing subprogram display of -gnatdJ instead of
    crashing.
    
    gcc/ada/
    
            * exp_ch4.adb (Expand_Composite_Equality): Call Error_Msg_N
            instead of Error_Msg.

Diff:
---
 gcc/ada/exp_ch4.adb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb
index 762e75616a7f..7a2003691ec5 100644
--- a/gcc/ada/exp_ch4.adb
+++ b/gcc/ada/exp_ch4.adb
@@ -2340,12 +2340,12 @@ package body Exp_Ch4 is
                pragma Assert
                  (Is_First_Subtype (Outer_Type)
                    or else Is_Generic_Actual_Type (Outer_Type));
-               Error_Msg_Node_1 := Outer_Type;
                Error_Msg_Node_2 := Comp_Type;
-               Error_Msg
-                 ("?_q?""="" for type & uses predefined ""="" for }", Loc);
+               Error_Msg_N
+                 ("?_q?""="" for type & uses predefined ""="" for }",
+                  Outer_Type);
                Error_Msg_Sloc := Sloc (Op);
-               Error_Msg ("\?_q?""="" # is ignored here", Loc);
+               Error_Msg_N ("\?_q?""="" # is ignored here", Outer_Type);
             end if;
          end;

Reply via email to