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 AFDDA384F489 for ; Thu, 24 Nov 2022 01:52:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AFDDA384F489 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669254734; 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=Jds1r1zNEI2Lfc21XhQPkQQ178fhdADcbOyNbYCUo/Y=; b=KFz+bTwp+F5FNIQvklZyyLMG7oYn1d+IrD1C8/WOFqRAbPHdcodL2pbc4fc4/gd6aWwMlb ZJ7p6cF4XOMItmNPRHRDXv3GoOw3GtJuNIj28QtwC9OvzOfI/SYxyHBpeXMJ4a6IYigVIK xAmpOCkSGOiDvEa7Uy45P9Sv2A/o3r0= 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-154-s7RSD1XgPBuavh8qYLgyQg-1; Wed, 23 Nov 2022 20:52:11 -0500 X-MC-Unique: s7RSD1XgPBuavh8qYLgyQg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9EC17101A56C for ; Thu, 24 Nov 2022 01:52:11 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.2.16.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5EAB01121314; Thu, 24 Nov 2022 01:52:11 +0000 (UTC) From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [committed 2/2] analyzer: eliminate region_model::on_ fns for sockets Date: Wed, 23 Nov 2022 20:52:03 -0500 Message-Id: <20221124015203.3367244-2-dmalcolm@redhat.com> In-Reply-To: <20221124015203.3367244-1-dmalcolm@redhat.com> References: <20221124015203.3367244-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,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 List-Id: This mostly mechanical patch eliminates a confusing extra layer of redundant calls in the handling of socket-related functions. Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu. Pushed to trunk as r13-4274-g5d2908b7bf9305. gcc/analyzer/ChangeLog: * region-model.h (region_model::on_socket): Delete decl. (region_model::on_bind): Likewise. (region_model::on_listen): Likewise. (region_model::on_accept): Likewise. (region_model::on_connect): Likewise. * sm-fd.cc (kf_socket::outcome_of_socket::update_model): Move body of region_model::on_socket into here, ... (region_model::on_socket): ...eliminating this function. (kf_bind::outcome_of_bind::update_model): Likewise for on_bind... (region_model::on_bind): ...eliminating this function. (kf_listen::outcome_of_listen::update_model): Likewise fo on_listen... (region_model::on_listen): ...eliminating this function. (kf_accept::outcome_of_accept::update_model): Likewise fo on_accept... (region_model::on_accept): ...eliminating this function. (kf_connect::outcome_of_connect::update_model): Likewise fo on_connect... (region_model::on_connect): ...eliminating this function. Signed-off-by: David Malcolm --- gcc/analyzer/region-model.h | 5 -- gcc/analyzer/sm-fd.cc | 144 ++++++++++++------------------------ 2 files changed, 49 insertions(+), 100 deletions(-) diff --git a/gcc/analyzer/region-model.h b/gcc/analyzer/region-model.h index 8e4616c28de..4413f5542d9 100644 --- a/gcc/analyzer/region-model.h +++ b/gcc/analyzer/region-model.h @@ -515,11 +515,6 @@ class region_model /* Implemented in sm-fd.cc */ void mark_as_valid_fd (const svalue *sval, region_model_context *ctxt); - bool on_socket (const call_details &cd, bool successful); - bool on_bind (const call_details &cd, bool successful); - bool on_listen (const call_details &cd, bool successful); - bool on_accept (const call_details &cd, bool successful); - bool on_connect (const call_details &cd, bool successful); /* Implemented in sm-malloc.cc */ void on_realloc_with_move (const call_details &cd, diff --git a/gcc/analyzer/sm-fd.cc b/gcc/analyzer/sm-fd.cc index af59aef401d..8f8ec851bab 100644 --- a/gcc/analyzer/sm-fd.cc +++ b/gcc/analyzer/sm-fd.cc @@ -2270,7 +2270,16 @@ public: region_model_context *ctxt) const final override { const call_details cd (get_call_details (model, ctxt)); - return cd.get_model ()->on_socket (cd, m_success); + sm_state_map *smap; + const fd_state_machine *fd_sm; + std::unique_ptr sm_ctxt; + if (!get_fd_state (ctxt, &smap, &fd_sm, NULL, &sm_ctxt)) + return true; + const extrinsic_state *ext_state = ctxt->get_ext_state (); + if (!ext_state) + return true; + + return fd_sm->on_socket (cd, m_success, sm_ctxt.get (), *ext_state); } }; @@ -2290,24 +2299,6 @@ public: } }; -/* Specialcase hook for handling "socket", for use by - kf_socket::outcome_of_socket::update_model. */ - -bool -region_model::on_socket (const call_details &cd, bool successful) -{ - sm_state_map *smap; - const fd_state_machine *fd_sm; - std::unique_ptr sm_ctxt; - if (!get_fd_state (cd.get_ctxt (), &smap, &fd_sm, NULL, &sm_ctxt)) - return true; - const extrinsic_state *ext_state = cd.get_ctxt ()->get_ext_state (); - if (!ext_state) - return true; - - return fd_sm->on_socket (cd, successful, sm_ctxt.get (), *ext_state); -} - /* Handle calls to "bind". See e.g. https://man7.org/linux/man-pages/man3/bind.3p.html */ @@ -2326,7 +2317,15 @@ public: region_model_context *ctxt) const final override { const call_details cd (get_call_details (model, ctxt)); - return cd.get_model ()->on_bind (cd, m_success); + sm_state_map *smap; + const fd_state_machine *fd_sm; + std::unique_ptr sm_ctxt; + if (!get_fd_state (ctxt, &smap, &fd_sm, NULL, &sm_ctxt)) + return true; + const extrinsic_state *ext_state = ctxt->get_ext_state (); + if (!ext_state) + return true; + return fd_sm->on_bind (cd, m_success, sm_ctxt.get (), *ext_state); } }; @@ -2346,24 +2345,6 @@ public: } }; -/* Specialcase hook for handling "bind", for use by - kf_bind::outcome_of_bind::update_model. */ - -bool -region_model::on_bind (const call_details &cd, bool successful) -{ - sm_state_map *smap; - const fd_state_machine *fd_sm; - std::unique_ptr sm_ctxt; - if (!get_fd_state (cd.get_ctxt (), &smap, &fd_sm, NULL, &sm_ctxt)) - return true; - const extrinsic_state *ext_state = cd.get_ctxt ()->get_ext_state (); - if (!ext_state) - return true; - - return fd_sm->on_bind (cd, successful, sm_ctxt.get (), *ext_state); -} - /* Handle calls to "listen". See e.g. https://man7.org/linux/man-pages/man3/listen.3p.html */ @@ -2381,7 +2362,16 @@ class kf_listen : public known_function region_model_context *ctxt) const final override { const call_details cd (get_call_details (model, ctxt)); - return cd.get_model ()->on_listen (cd, m_success); + sm_state_map *smap; + const fd_state_machine *fd_sm; + std::unique_ptr sm_ctxt; + if (!get_fd_state (ctxt, &smap, &fd_sm, NULL, &sm_ctxt)) + return true; + const extrinsic_state *ext_state = ctxt->get_ext_state (); + if (!ext_state) + return true; + + return fd_sm->on_listen (cd, m_success, sm_ctxt.get (), *ext_state); } }; @@ -2401,24 +2391,6 @@ class kf_listen : public known_function } }; -/* Specialcase hook for handling "listen", for use by - kf_listen::outcome_of_listen::update_model. */ - -bool -region_model::on_listen (const call_details &cd, bool successful) -{ - sm_state_map *smap; - const fd_state_machine *fd_sm; - std::unique_ptr sm_ctxt; - if (!get_fd_state (cd.get_ctxt (), &smap, &fd_sm, NULL, &sm_ctxt)) - return true; - const extrinsic_state *ext_state = cd.get_ctxt ()->get_ext_state (); - if (!ext_state) - return true; - - return fd_sm->on_listen (cd, successful, sm_ctxt.get (), *ext_state); -} - /* Handle calls to "accept". See e.g. https://man7.org/linux/man-pages/man3/accept.3p.html */ @@ -2436,7 +2408,16 @@ class kf_accept : public known_function region_model_context *ctxt) const final override { const call_details cd (get_call_details (model, ctxt)); - return cd.get_model ()->on_accept (cd, m_success); + sm_state_map *smap; + const fd_state_machine *fd_sm; + std::unique_ptr sm_ctxt; + if (!get_fd_state (ctxt, &smap, &fd_sm, NULL, &sm_ctxt)) + return true; + const extrinsic_state *ext_state = ctxt->get_ext_state (); + if (!ext_state) + return true; + + return fd_sm->on_accept (cd, m_success, sm_ctxt.get (), *ext_state); } }; @@ -2458,24 +2439,6 @@ class kf_accept : public known_function } }; -/* Specialcase hook for handling "accept", for use by - kf_accept::outcome_of_accept::update_model. */ - -bool -region_model::on_accept (const call_details &cd, bool successful) -{ - sm_state_map *smap; - const fd_state_machine *fd_sm; - std::unique_ptr sm_ctxt; - if (!get_fd_state (cd.get_ctxt (), &smap, &fd_sm, NULL, &sm_ctxt)) - return true; - const extrinsic_state *ext_state = cd.get_ctxt ()->get_ext_state (); - if (!ext_state) - return true; - - return fd_sm->on_accept (cd, successful, sm_ctxt.get (), *ext_state); -} - /* Handle calls to "connect". See e.g. https://man7.org/linux/man-pages/man3/connect.3p.html */ @@ -2494,7 +2457,16 @@ public: region_model_context *ctxt) const final override { const call_details cd (get_call_details (model, ctxt)); - return cd.get_model ()->on_connect (cd, m_success); + sm_state_map *smap; + const fd_state_machine *fd_sm; + std::unique_ptr sm_ctxt; + if (!get_fd_state (ctxt, &smap, &fd_sm, NULL, &sm_ctxt)) + return true; + const extrinsic_state *ext_state = ctxt->get_ext_state (); + if (!ext_state) + return true; + + return fd_sm->on_connect (cd, m_success, sm_ctxt.get (), *ext_state); } }; @@ -2515,24 +2487,6 @@ public: } }; -/* Specialcase hook for handling "connect", for use by - kf_connect::outcome_of_connect::update_model. */ - -bool -region_model::on_connect (const call_details &cd, bool successful) -{ - sm_state_map *smap; - const fd_state_machine *fd_sm; - std::unique_ptr sm_ctxt; - if (!get_fd_state (cd.get_ctxt (), &smap, &fd_sm, NULL, &sm_ctxt)) - return true; - const extrinsic_state *ext_state = cd.get_ctxt ()->get_ext_state (); - if (!ext_state) - return true; - - return fd_sm->on_connect (cd, successful, sm_ctxt.get (), *ext_state); -} - /* Handler for calls to "pipe" and "pipe2". See e.g. https://www.man7.org/linux/man-pages/man2/pipe.2.html */ -- 2.26.3