From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by sourceware.org (Postfix) with ESMTPS id 208EA38432F7 for ; Tue, 3 Jan 2023 09:36:34 +0000 (GMT) Received: by mail-wm1-x32e.google.com with SMTP id ja17so22205524wmb.3 for ; Tue, 03 Jan 2023 01:36:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=e4F+RQq4tlB5smWazZlC1D8PJ7D++alFL1g+mmKyJqo=; b=C41Syrhd9GhPkockj3jZz4+OwfMt95fUJsCDPBXEQMtbsvLzDMBiCj/b/oE9vHFBZ9 hAcfqNgXs4SyJpqe5R+/6xGTtl16nvXqDmslQdN6iL/3zbodENio97IX32SoJHy5XvJ6 7vqN5yqSxmZw2XspklzQDMWokMz/VKJ3vr+A9iQA8F2sUz/I/5GfZnbEm05ocRVjvM1N wKFeuIIVWiXa/EWxa+K/GmqdD3z7joffJqXFYTKO0oL1vY8Y5K31wgslf1agSdnSbDYV inZU9TTNjkkIfGy3fGWa4nPBuNkfzTsvYvrD57JMZ99WOaOGqBxiqmD/sDMvFVSkE/gO 94qQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=e4F+RQq4tlB5smWazZlC1D8PJ7D++alFL1g+mmKyJqo=; b=Cmj6/ZbD4n60A3lFEaFi/8iz3bcYIPieN71ttA8kEx1GCZeBvz1YDTG+kPYVtJ784f q3TaX33nehjVoaiQ507GBnW9j81MuA5SpmdpY8fI7lrxg3oY2pvsJOlomPiqKrzA05dW mIjUpNt3yMnL19aF6fKiP+B2fsEe/mUsBUnWABoS54Q7TOQFzM7+UIg0zdjhTd48WKTr qGpgF8K6vx31QdEzr8Iv8gjSEMvavVNSeopnZfs4CKw017Qh6s9LB7bH5zDGfILNghj1 SphP5xYC8NhN29I13TlRpRzy0SySruxT/edO1frQAbFQ4OSCs3OKUa1xGq2bKPEdnI1w AjLQ== X-Gm-Message-State: AFqh2kqdrqXBxJw2aArK7obRWf5tYHleHsgaMwIUWitPgO/9M9jAHcbH hwqCNeSkOPkK/I7u8Ssk+mzV43XMC/3M+V3wgXc= X-Google-Smtp-Source: AMrXdXvSeBu1qby1pgwDlASgzCYCXpjtk32P0JwuQKVlz8vej6FIp57vBQAAj9sj4ZCk2g0Yns32pQ== X-Received: by 2002:a05:600c:4f55:b0:3cf:7197:e67c with SMTP id m21-20020a05600c4f5500b003cf7197e67cmr29600214wmq.25.1672738593028; Tue, 03 Jan 2023 01:36:33 -0800 (PST) Received: from localhost.localdomain (static-176-191-105-132.ftth.abo.bbox.fr. [176.191.105.132]) by smtp.gmail.com with ESMTPSA id c10-20020a05600c0a4a00b003c6b70a4d69sm41964117wmq.42.2023.01.03.01.36.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Jan 2023 01:36:32 -0800 (PST) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Ghjuvan Lacambre Subject: [COMMITTED] ada: Fix unescaped quotes when combining fdiagnostics-format=json and gnatdJ Date: Tue, 3 Jan 2023 10:36:26 +0100 Message-Id: <20230103093626.77011-1-poulhies@adacore.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,WEIRD_QUOTING autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Ghjuvan Lacambre 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. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/errout.adb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gcc/ada/errout.adb b/gcc/ada/errout.adb index b30e8b51d15..261ba2e8033 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 ("}"); -- 2.34.1