From patchwork Thu Nov 3 17:51:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 15049 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp678772wru; Thu, 3 Nov 2022 10:53:10 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5iWC0DBPkYZ5TcYTnILPOggFMLmfY0AtfPU+1YeIZTIvwO/PzrKg/OpS/sm+FzXMa3K+pi X-Received: by 2002:a05:6402:5406:b0:452:1560:f9d4 with SMTP id ev6-20020a056402540600b004521560f9d4mr31698944edb.333.1667497990584; Thu, 03 Nov 2022 10:53:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667497990; cv=none; d=google.com; s=arc-20160816; b=JyxpCVt7JkPm7DbAsQ9OqZ2E4jcAT0WSvVBjHOHyvYV2Wa0l5j+sjatOjSM5m9mE4R cTMcCxYIEZyURQoQHLVH6fkrWx0jUjdXHsAuBOwxPUbENH5mfWT06tlcpOzuruxnRZ5A Yo9ZTxf6/ia6gqXyfQoe8WVjIfbpHI2oCmUoaQO0MKc0H4jusoGz9ZewkbdF6EChgSu/ GR2q35y8vNxUF6xqdMZGsjEw7l0KbaYDajXtgHwwk//dcaK9xLS7jXTXi/hhAucn3zqb fBGw4gP1pi0/+Tu0ICyxNXI5vw44uiWsWa6okwN/URZqLOmENRoU2OCLqyW8lNpgwGvL M03Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=G2BfzREnpIAxyaqL/i+rKHnaB3DGiszuA3XfAnTChr0=; b=1Bs1o4yRaYsdQN2z0p1cIgTd7EQhTZs3evBqRlds4TlzIbvVwpJ4K50vFD2B41FDyQ JGXwnHusXd1hVkvsawJ1tuPP06KB+QOLo28M7sKScIUyXJ86s9hW+1bQrFzlbJHH649b zVKuq2n21224GcCBhvETqX1YZ2CA8U5ERd3hz+Pphmk47L1pT51b+2TbYMAOL1SsrFaq Y0Xp/f4l7j1y2DeWv2yXc7aOHMUDSXcJ+jpR0rU7Vn8AjOdtaUR176c6FizwNRivcx8J YtMslQH/RjeDdaRdEfden3Bk3He6Oi1phkFJ+LDAq9aih4EDt+sklccNsnJ0P1WthfH7 D3NQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=M6eOW7XI; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id js3-20020a17090797c300b0078e1d1d6005si2072252ejc.23.2022.11.03.10.53.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 10:53:10 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=M6eOW7XI; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1EFF43857424 for ; Thu, 3 Nov 2022 17:52:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1EFF43857424 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1667497953; bh=G2BfzREnpIAxyaqL/i+rKHnaB3DGiszuA3XfAnTChr0=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=M6eOW7XIdsogJhg1RsBlQ73kAtwDnp2ssSL6U9ez56QsXEMQJv4Xa6wi+vc87EKUE YtEqxAnrF5Elvf6L1YeGS8u3A0pd9Eb6PMtv2t1lE/qT9f3RfLZRbbxtnZTeSui2hM 22WaGH216wAEVdkwMVr6uOXuvOf+mesl81kjGsEE= 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 ESMTPS id 997933858D37 for ; Thu, 3 Nov 2022 17:51:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 997933858D37 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-399-ZQuNp5PSNM6anQoupMOzmQ-1; Thu, 03 Nov 2022 13:51:39 -0400 X-MC-Unique: ZQuNp5PSNM6anQoupMOzmQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C656E185A78F for ; Thu, 3 Nov 2022 17:51:38 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.2.17.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id A52A82166B26; Thu, 3 Nov 2022 17:51:38 +0000 (UTC) To: gcc-patches@gcc.gnu.org Subject: [committed 2/8] analyzer: use std::unique_ptr for saved_diagnostic::m_stmt_finder Date: Thu, 3 Nov 2022 13:51:29 -0400 Message-Id: <20221103175135.2269543-3-dmalcolm@redhat.com> In-Reply-To: <20221103175135.2269543-1-dmalcolm@redhat.com> References: <20221103175135.2269543-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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, RCVD_IN_MSPIKE_H2, 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: David Malcolm via Gcc-patches From: David Malcolm Reply-To: David Malcolm Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748498372557304940?= X-GMAIL-MSGID: =?utf-8?q?1748498372557304940?= gcc/analyzer/ChangeLog: * diagnostic-manager.cc (saved_diagnostic::saved_diagnostic): Make stmt_finder const. (saved_diagnostic::~saved_diagnostic): Remove explicit delete of m_stmt_finder. (diagnostic_manager::add_diagnostic): Make stmt_finder const. * diagnostic-manager.h (saved_diagnostic::saved_diagnostic): Likewise. (saved_diagnostic::m_stmt_finder): Convert to std::unique_ptr. (diagnostic_manager::add_diagnostic): Make stmt_finder const. * engine.cc (impl_sm_context::impl_sm_context): Likewise. (impl_sm_context::m_stmt_finder): Likewise. (leak_stmt_finder::clone): Convert return type to std::unique_ptr. * exploded-graph.h (stmt_finder::clone): Likewise. Signed-off-by: David Malcolm --- gcc/analyzer/diagnostic-manager.cc | 7 +++---- gcc/analyzer/diagnostic-manager.h | 8 ++++---- gcc/analyzer/engine.cc | 8 ++++---- gcc/analyzer/exploded-graph.h | 2 +- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/gcc/analyzer/diagnostic-manager.cc b/gcc/analyzer/diagnostic-manager.cc index 0444e52258c..bb8584a1e0b 100644 --- a/gcc/analyzer/diagnostic-manager.cc +++ b/gcc/analyzer/diagnostic-manager.cc @@ -635,7 +635,7 @@ epath_finder::dump_feasible_path (const exploded_node *target_enode, saved_diagnostic::saved_diagnostic (const state_machine *sm, const exploded_node *enode, const supernode *snode, const gimple *stmt, - stmt_finder *stmt_finder, + const stmt_finder *stmt_finder, tree var, const svalue *sval, state_machine::state_t state, @@ -662,7 +662,6 @@ saved_diagnostic::saved_diagnostic (const state_machine *sm, saved_diagnostic::~saved_diagnostic () { - delete m_stmt_finder; delete m_best_epath; delete m_problem; } @@ -961,7 +960,7 @@ bool diagnostic_manager::add_diagnostic (const state_machine *sm, exploded_node *enode, const supernode *snode, const gimple *stmt, - stmt_finder *finder, + const stmt_finder *finder, tree var, const svalue *sval, state_machine::state_t state, @@ -1010,7 +1009,7 @@ diagnostic_manager::add_diagnostic (const state_machine *sm, bool diagnostic_manager::add_diagnostic (exploded_node *enode, const supernode *snode, const gimple *stmt, - stmt_finder *finder, + const stmt_finder *finder, std::unique_ptr d) { gcc_assert (enode); diff --git a/gcc/analyzer/diagnostic-manager.h b/gcc/analyzer/diagnostic-manager.h index fdab038d7a1..c87f2159753 100644 --- a/gcc/analyzer/diagnostic-manager.h +++ b/gcc/analyzer/diagnostic-manager.h @@ -33,7 +33,7 @@ public: saved_diagnostic (const state_machine *sm, const exploded_node *enode, const supernode *snode, const gimple *stmt, - stmt_finder *stmt_finder, + const stmt_finder *stmt_finder, tree var, const svalue *sval, state_machine::state_t state, std::unique_ptr d, @@ -72,7 +72,7 @@ public: const exploded_node *m_enode; const supernode *m_snode; const gimple *m_stmt; - stmt_finder *m_stmt_finder; + std::unique_ptr m_stmt_finder; tree m_var; const svalue *m_sval; state_machine::state_t m_state; @@ -113,7 +113,7 @@ public: bool add_diagnostic (const state_machine *sm, exploded_node *enode, const supernode *snode, const gimple *stmt, - stmt_finder *finder, + const stmt_finder *finder, tree var, const svalue *sval, state_machine::state_t state, @@ -121,7 +121,7 @@ public: bool add_diagnostic (exploded_node *enode, const supernode *snode, const gimple *stmt, - stmt_finder *finder, + const stmt_finder *finder, std::unique_ptr d); void add_note (std::unique_ptr pn); diff --git a/gcc/analyzer/engine.cc b/gcc/analyzer/engine.cc index fd532b1384d..553957ad982 100644 --- a/gcc/analyzer/engine.cc +++ b/gcc/analyzer/engine.cc @@ -282,7 +282,7 @@ public: const sm_state_map *old_smap, sm_state_map *new_smap, path_context *path_ctxt, - stmt_finder *stmt_finder = NULL, + const stmt_finder *stmt_finder = NULL, bool unknown_side_effects = false) : sm_context (sm_idx, sm), m_logger (eg.get_logger ()), @@ -523,7 +523,7 @@ public: const sm_state_map *m_old_smap; sm_state_map *m_new_smap; path_context *m_path_ctxt; - stmt_finder *m_stmt_finder; + const stmt_finder *m_stmt_finder; /* Are we handling an external function with unknown side effects? */ bool m_unknown_side_effects; @@ -538,9 +538,9 @@ public: leak_stmt_finder (const exploded_graph &eg, tree var) : m_eg (eg), m_var (var) {} - stmt_finder *clone () const final override + std::unique_ptr clone () const final override { - return new leak_stmt_finder (m_eg, m_var); + return make_unique (m_eg, m_var); } const gimple *find_stmt (const exploded_path &epath) diff --git a/gcc/analyzer/exploded-graph.h b/gcc/analyzer/exploded-graph.h index dae73daf54a..7947f50cdd7 100644 --- a/gcc/analyzer/exploded-graph.h +++ b/gcc/analyzer/exploded-graph.h @@ -991,7 +991,7 @@ class stmt_finder { public: virtual ~stmt_finder () {} - virtual stmt_finder *clone () const = 0; + virtual std::unique_ptr clone () const = 0; virtual const gimple *find_stmt (const exploded_path &epath) = 0; };