From: Eric Botcazou <ebotcazou@adacore.com>
Date: Thu, 26 Jan 2023 23:05:37 +0000 (+0100)
Subject: ada: Make internal_error_function more robust
X-Git-Tag: basepoints/gcc-15~8750
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f60d3abea1106dca6565bb390eabfe19c84e2f40;p=thirdparty%2Fgcc.git

ada: Make internal_error_function more robust

gcc/ada/

	* gcc-interface/misc.cc (internal_error_function): Be prepared for
	an input_location set to UNKNOWN_LOCATION.
---

diff --git a/gcc/ada/gcc-interface/misc.cc b/gcc/ada/gcc-interface/misc.cc
index 56c7bb9b5334..30319ae58b1b 100644
--- a/gcc/ada/gcc-interface/misc.cc
+++ b/gcc/ada/gcc-interface/misc.cc
@@ -330,13 +330,23 @@ internal_error_function (diagnostic_context *context, const char *msgid,
   sp.Bounds = &temp;
   sp.Array = buffer;
 
-  xloc = expand_location (input_location);
-  if (context->show_column && xloc.column != 0)
-    loc = xasprintf ("%s:%d:%d", xloc.file, xloc.line, xloc.column);
+  if (input_location == UNKNOWN_LOCATION)
+    {
+      loc = NULL;
+      temp_loc.Low_Bound = 1;
+      temp_loc.High_Bound = 0;
+    }
   else
-    loc = xasprintf ("%s:%d", xloc.file, xloc.line);
-  temp_loc.Low_Bound = 1;
-  temp_loc.High_Bound = strlen (loc);
+    {
+      xloc = expand_location (input_location);
+      if (context->show_column && xloc.column != 0)
+	loc = xasprintf ("%s:%d:%d", xloc.file, xloc.line, xloc.column);
+      else
+	loc = xasprintf ("%s:%d", xloc.file, xloc.line);
+      temp_loc.Low_Bound = 1;
+      temp_loc.High_Bound = strlen (loc);
+    }
+
   sp_loc.Bounds = &temp_loc;
   sp_loc.Array = loc;