From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 19770385DC05 for ; Thu, 7 Jul 2022 20:01:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 19770385DC05 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-610-fJCPmCreMLKxQAx__RqlVQ-1; Thu, 07 Jul 2022 16:00:58 -0400 X-MC-Unique: fJCPmCreMLKxQAx__RqlVQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CF5CF801231 for ; Thu, 7 Jul 2022 20:00:57 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.2.17.251]) by smtp.corp.redhat.com (Postfix) with ESMTP id ACEA42026D64; Thu, 7 Jul 2022 20:00:57 +0000 (UTC) From: David Malcolm To: gcc-patches@gcc.gnu.org Subject: [pushed 2/2] analyzer: use label_text for superedge::get_description Date: Thu, 7 Jul 2022 16:00:55 -0400 Message-Id: <20220707200055.4190592-2-dmalcolm@redhat.com> In-Reply-To: <20220707200055.4190592-1-dmalcolm@redhat.com> References: <20220707200055.4190592-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-11.9 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, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jul 2022 20:01:07 -0000 No functional change intended. Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu. Lightly tested with valgrind. Pushed to trunk as r13-1564-g52f538fa4a13d5. gcc/analyzer/ChangeLog: * checker-path.cc (start_cfg_edge_event::get_desc): Update for superedge::get_description returning a label_text. * engine.cc (feasibility_state::maybe_update_for_edge): Likewise. * supergraph.cc (superedge::dump): Likewise. (superedge::get_description): Convert return type from char * to label_text. * supergraph.h (superedge::get_description): Likewise. Signed-off-by: David Malcolm --- gcc/analyzer/checker-path.cc | 3 +-- gcc/analyzer/engine.cc | 5 ++--- gcc/analyzer/supergraph.cc | 13 +++++-------- gcc/analyzer/supergraph.h | 2 +- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/gcc/analyzer/checker-path.cc b/gcc/analyzer/checker-path.cc index 959ffdd853c..211cf3e0333 100644 --- a/gcc/analyzer/checker-path.cc +++ b/gcc/analyzer/checker-path.cc @@ -594,8 +594,7 @@ label_text start_cfg_edge_event::get_desc (bool can_colorize) const { bool user_facing = !flag_analyzer_verbose_edges; - label_text edge_desc - = label_text::take (m_sedge->get_description (user_facing)); + label_text edge_desc (m_sedge->get_description (user_facing)); if (user_facing) { if (edge_desc.m_buffer && strlen (edge_desc.m_buffer) > 0) diff --git a/gcc/analyzer/engine.cc b/gcc/analyzer/engine.cc index 0674c8ba3b6..888123f2b95 100644 --- a/gcc/analyzer/engine.cc +++ b/gcc/analyzer/engine.cc @@ -4586,12 +4586,11 @@ feasibility_state::maybe_update_for_edge (logger *logger, { if (logger) { - char *desc = sedge->get_description (false); + label_text desc (sedge->get_description (false)); logger->log (" sedge: SN:%i -> SN:%i %s", sedge->m_src->m_index, sedge->m_dest->m_index, - desc); - free (desc); + desc.m_buffer); } const gimple *last_stmt = src_point.get_supernode ()->get_last_stmt (); diff --git a/gcc/analyzer/supergraph.cc b/gcc/analyzer/supergraph.cc index f023c533a09..52b4852404d 100644 --- a/gcc/analyzer/supergraph.cc +++ b/gcc/analyzer/supergraph.cc @@ -854,13 +854,12 @@ void superedge::dump (pretty_printer *pp) const { pp_printf (pp, "edge: SN: %i -> SN: %i", m_src->m_index, m_dest->m_index); - char *desc = get_description (false); - if (strlen (desc) > 0) + label_text desc (get_description (false)); + if (strlen (desc.m_buffer) > 0) { pp_space (pp); - pp_string (pp, desc); + pp_string (pp, desc.m_buffer); } - free (desc); } /* Dump this superedge to stderr. */ @@ -998,17 +997,15 @@ superedge::get_any_callgraph_edge () const /* Build a description of this superedge (e.g. "true" for the true edge of a conditional, or "case 42:" for a switch case). - The caller is responsible for freeing the result. - If USER_FACING is false, the result also contains any underlying CFG edge flags. e.g. " (flags FALLTHRU | DFS_BACK)". */ -char * +label_text superedge::get_description (bool user_facing) const { pretty_printer pp; dump_label_to_pp (&pp, user_facing); - return xstrdup (pp_formatted_text (&pp)); + return label_text::take (xstrdup (pp_formatted_text (&pp))); } /* Implementation of superedge::dump_label_to_pp for non-switch CFG diff --git a/gcc/analyzer/supergraph.h b/gcc/analyzer/supergraph.h index 42c6df57435..e9a5be27d88 100644 --- a/gcc/analyzer/supergraph.h +++ b/gcc/analyzer/supergraph.h @@ -331,7 +331,7 @@ class superedge : public dedge ::edge get_any_cfg_edge () const; cgraph_edge *get_any_callgraph_edge () const; - char *get_description (bool user_facing) const; + label_text get_description (bool user_facing) const; protected: superedge (supernode *src, supernode *dest, enum edge_kind kind) -- 2.26.3