From patchwork Wed Jul 24 22:18:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 1964555 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ASsww34m; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WTpMn4sLTz1ybY for ; Thu, 25 Jul 2024 08:19:17 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E5A15385C6CC for ; Wed, 24 Jul 2024 22:19:15 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTP id 7D116385B50B for ; Wed, 24 Jul 2024 22:18:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7D116385B50B Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 7D116385B50B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721859524; cv=none; b=V3uFJjH+oj4GfE1dr6XVQxG3Yaad7jO5BPctY/4aMLDFt9oRjbRDMiSQT6htk6xaYNvcJ7P2SYBy1Bu1VuJMEp6TiVyT+0oXJc4BroOLwHStvSFBYo1nnZTA5WLrw1rGfjaSgIu10Cb9N+Rw6fEaGlmEhHvFZsSl8jgmnJyr7IY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721859524; c=relaxed/simple; bh=+n+9hGRUe38uUItzpdcoU62JLNWv/ZsqI0yM4FNTiyw=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=EJiq/VSbOHbhRxAkze8Ho7V768dSn6MIwazT9C8mtYHhfDzIaGZurst2A8IvDz1sP/V8zZRgoVPpTZwkbvwpdFWAoZ1qiHhk/zKYhToF3xlkmVKrL9NiKpkrxhEX0eMuR6/EeqYzrOsMyqe1cu8tQzSiZCL+ndQoqRr0YfwWK7M= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1721859521; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YtdIlYR5KQsHCTDu1890MTxIVhyh33TrBDWXX5AHdkc=; b=ASsww34mSSSEUGVyzaCZnxFzpXbs2lDXqZ85LsXgKI0IX8EO9/49K2Fy6i003xCTY99pL6 vfRkdEB2mv69XyNpzL9xcR4QC1WeFgcWN/hz4GnxGVLtx61STJbwvooBr4LhuT8SDY+Yia PAhuWxH858YPusEzSA+an2G88YDoSx0= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-439-H9WEiIqJPSyd47ooI1tSQA-1; Wed, 24 Jul 2024 18:18:38 -0400 X-MC-Unique: H9WEiIqJPSyd47ooI1tSQA-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id F20921955F42 for ; Wed, 24 Jul 2024 22:18:37 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.22.33.183]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EE8831955F3B; Wed, 24 Jul 2024 22:18:36 +0000 (UTC) From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [PATCH 02/16] json: add array::append_string Date: Wed, 24 Jul 2024 18:18:10 -0400 Message-Id: <20240724221824.585054-3-dmalcolm@redhat.com> In-Reply-To: <20240724221824.585054-1-dmalcolm@redhat.com> References: <20240724221824.585054-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org No functional change intended. gcc/analyzer/ChangeLog: * supergraph.cc (supernode::to_json): Avoid naked "new" by using json::array::append_string. (supernode::to_json): Likewise. gcc/ChangeLog: * diagnostic-format-sarif.cc (sarif_artifact::populate_roles): Avoid naked "new" by using json::array::append_string. (sarif_builder::maybe_make_kinds_array): Likewise. * json.cc (json::array::append_string): New. (selftest::test_writing_arrays): Use it. * json.h (json::array::append_string): New decl. * optinfo-emit-json.cc (optrecord_json_writer::pass_to_json): Avoid naked "new" by using json::array::append_string. (optrecord_json_writer::optinfo_to_json): Likewise. Signed-off-by: David Malcolm --- gcc/analyzer/supergraph.cc | 4 ++-- gcc/diagnostic-format-sarif.cc | 8 ++++---- gcc/json.cc | 9 ++++++++- gcc/json.h | 1 + gcc/optinfo-emit-json.cc | 4 ++-- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/gcc/analyzer/supergraph.cc b/gcc/analyzer/supergraph.cc index 4dc7942b26aa..20c62856d4b6 100644 --- a/gcc/analyzer/supergraph.cc +++ b/gcc/analyzer/supergraph.cc @@ -747,7 +747,7 @@ supernode::to_json () const pretty_printer pp; pp_format_decoder (&pp) = default_tree_printer; pp_gimple_stmt_1 (&pp, stmt, 0, (dump_flags_t)0); - phi_arr->append (new json::string (pp_formatted_text (&pp))); + phi_arr->append_string (pp_formatted_text (&pp)); } snode_obj->set ("phis", phi_arr); } @@ -762,7 +762,7 @@ supernode::to_json () const pretty_printer pp; pp_format_decoder (&pp) = default_tree_printer; pp_gimple_stmt_1 (&pp, stmt, 0, (dump_flags_t)0); - stmt_arr->append (new json::string (pp_formatted_text (&pp))); + stmt_arr->append_string (pp_formatted_text (&pp)); } snode_obj->set ("stmts", stmt_arr); } diff --git a/gcc/diagnostic-format-sarif.cc b/gcc/diagnostic-format-sarif.cc index 225476995d13..7105f7853318 100644 --- a/gcc/diagnostic-format-sarif.cc +++ b/gcc/diagnostic-format-sarif.cc @@ -435,7 +435,7 @@ sarif_artifact::populate_roles () if (bitmap_bit_p (m_roles, i)) { enum diagnostic_artifact_role role = (enum diagnostic_artifact_role)i; - roles_arr->append (new json::string (get_artifact_role_string (role))); + roles_arr->append_string (get_artifact_role_string (role)); } set ("roles", roles_arr); } @@ -1394,13 +1394,13 @@ sarif_builder::maybe_make_kinds_array (diagnostic_event::meaning m) const json::array *kinds_arr = new json::array (); if (const char *verb_str = diagnostic_event::meaning::maybe_get_verb_str (m.m_verb)) - kinds_arr->append (new json::string (verb_str)); + kinds_arr->append_string (verb_str); if (const char *noun_str = diagnostic_event::meaning::maybe_get_noun_str (m.m_noun)) - kinds_arr->append (new json::string (noun_str)); + kinds_arr->append_string (noun_str); if (const char *property_str = diagnostic_event::meaning::maybe_get_property_str (m.m_property)) - kinds_arr->append (new json::string (property_str)); + kinds_arr->append_string (property_str); return kinds_arr; } diff --git a/gcc/json.cc b/gcc/json.cc index 53edca520556..86490259dabf 100644 --- a/gcc/json.cc +++ b/gcc/json.cc @@ -286,6 +286,13 @@ array::append (value *v) m_elements.safe_push (v); } +void +array::append_string (const char *utf8_value) +{ + gcc_assert (utf8_value); + append (new json::string (utf8_value)); +} + /* class json::float_number, a subclass of json::value, wrapping a double. */ /* Implementation of json::value::print for json::float_number. */ @@ -432,7 +439,7 @@ test_writing_arrays () arr.append (new json::string ("foo")); ASSERT_PRINT_EQ (arr, true, "[\"foo\"]"); - arr.append (new json::string ("bar")); + arr.append_string ("bar"); ASSERT_PRINT_EQ (arr, true, "[\"foo\",\n" " \"bar\"]"); diff --git a/gcc/json.h b/gcc/json.h index ad4f8c448f8c..d3493a72d525 100644 --- a/gcc/json.h +++ b/gcc/json.h @@ -130,6 +130,7 @@ class array : public value void print (pretty_printer *pp, bool formatted) const final override; void append (value *v); + void append_string (const char *utf8_value); private: auto_vec m_elements; diff --git a/gcc/optinfo-emit-json.cc b/gcc/optinfo-emit-json.cc index 1fa82d438db9..faae95fc232a 100644 --- a/gcc/optinfo-emit-json.cc +++ b/gcc/optinfo-emit-json.cc @@ -259,7 +259,7 @@ optrecord_json_writer::pass_to_json (opt_pass *pass) optgroup->name != NULL; optgroup++) if (optgroup->value != OPTGROUP_ALL && (pass->optinfo_flags & optgroup->value)) - optgroups->append (new json::string (optgroup->name)); + optgroups->append_string (optgroup->name); } obj->set_integer ("num", pass->static_pass_number); return obj; @@ -347,7 +347,7 @@ optrecord_json_writer::optinfo_to_json (const optinfo *optinfo) gcc_unreachable (); case OPTINFO_ITEM_KIND_TEXT: { - message->append (new json::string (item->get_text ())); + message->append_string (item->get_text ()); } break; case OPTINFO_ITEM_KIND_TREE: