From: Ghjuvan Lacambre <lacambre@adacore.com>
Date: Mon, 12 Dec 2022 13:54:47 +0000 (+0100)
Subject: ada: Fix unescaped quotes when combining fdiagnostics-format=json and gnatdJ
X-Git-Tag: basepoints/gcc-14~2234
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=201c21b0e847679645df1af3dd13459274f41047;p=thirdparty%2Fgcc.git

ada: Fix unescaped quotes when combining fdiagnostics-format=json and gnatdJ

This commit fixes a small bug where GNAT would emit unescaped quotes in
its -fdiagnostics-format=json output when using -gnatdJ and emitting
messages about operator functions (e.g. "=").

gcc/ada/

	* errout.adb (Write_JSON_Span): Escape subprogram name.
---

diff --git a/gcc/ada/errout.adb b/gcc/ada/errout.adb
index b30e8b51d159..261ba2e80331 100644
--- a/gcc/ada/errout.adb
+++ b/gcc/ada/errout.adb
@@ -2193,8 +2193,9 @@ package body Errout is
          end if;
 
          if Include_Subprogram_In_Messages then
-            Write_Str
-              (",""subprogram"":""" & Subprogram_Name_Ptr (Error.Node) & """");
+            Write_Str (",""subprogram"":""");
+            Write_JSON_Escaped_String (Subprogram_Name_Ptr (Error.Node));
+            Write_Str ("""");
          end if;
 
          Write_Str ("}");