From patchwork Thu Dec 14 14:13:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 178747 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp8574927dys; Thu, 14 Dec 2023 06:14:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IHvwCnTn4VGRG3I1z5LycJcXaw1MwYagg/m3h08Q6Q9C0eZzWPOlHUo7hDXGirwIEcMPzW9 X-Received: by 2002:a05:6102:f14:b0:464:8eb5:bed3 with SMTP id v20-20020a0561020f1400b004648eb5bed3mr4586876vss.24.1702563249389; Thu, 14 Dec 2023 06:14:09 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702563249; cv=pass; d=google.com; s=arc-20160816; b=L4Qz2oQ2cIsy6wwnwAiBivth+tgVKaF1NX1cixIiriah/LwAIn14gq6rS3UAsqtt+Y T4ASVJHuoIC9BN8YZaVRz5XzFMG1QM6Hn1Vv9HhidNe/9srBLQ5qfJI7S0DV1qWZfKvX w0CoT61kEgRvADSN1YrCakrE7E8hAOctCW9DUSbBrYp2dmPQP082t28NcyavgPzDqQAt JzH/ezQ75YEPZX4bNLy9uk5T29DYLvQZhQHGNdgswC8Zu66VruJyJVUrxj8pPDwysFqT yR6oTMCrmCxQKGSGtFPhoQt3GM6rWwsklgHEqcXjOgF/3bzAFZl2DlFqCINSf0zruZhv BXDQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=p6euUAmroPjbhjKykrkgxUOPnGh6wL05pkTTSYD9C9o=; fh=NXemEfxTRbZtBxUkxR2ehQUaYlcDfMdzPkO8MChVQE4=; b=uNlKLmRKXkenn9XoI+UStR6m0VXfvz1zJV1L01LAFQpicGCePCxhm9t5u1jYtXCQS2 Y2P73cYNyZq6s/5eR3M2jCysUUOHKY0S6yRqJ6njmzw/l7VCOaLTqAVSUMuGYZNNa1by RQEiWJH33NR2+NL0RusYTmcSpckrLtxFU+lHEMyofVO5rTGc1YzrKMMUuXnX8hjIO9Ei qOyRq68bZcbODhjjBR3YqrNXEBlB89L2mWFMdwj0gKDniiRzlWWGEq+aKmwv1q2xPmJy xTm7EFYmGr7hG6cA3N9gRAHCMCQy23fd/I14hZWGbLU2fQxgFUFi80CeD6l/3W5idjPG R5kg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=CxA2PmFw; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id s18-20020a67e352000000b0046613412085si2084281vsm.431.2023.12.14.06.14.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Dec 2023 06:14:09 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=CxA2PmFw; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 13A1E386181C for ; Thu, 14 Dec 2023 14:14:09 +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.133.124]) by sourceware.org (Postfix) with ESMTPS id D79AB3858D20 for ; Thu, 14 Dec 2023 14:13:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D79AB3858D20 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 D79AB3858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702563226; cv=none; b=uBNvI+jAQVDA02SoTgM12Kuam/Z64rowMXLf4XLMp3Sx3G4WPzPLIh22QFKOFcg6G/aUnDHZ+O6ZBdbLby/yrP5RUqnEsXkLyW6g36+uq4YoISL8KTQjbk0heUpTP9h6cSBpUJUKQy4cp3gJa9IjHKFBBgBNqRa7bWEv5lbd0iA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702563226; c=relaxed/simple; bh=wF+OYDPl5RxVS5HdyvZblU0J+mf8rCAJ0hBnyrVzkxY=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=AXjbeRkXBOCJKBkLa6JuOepjI2y3nO8osl6Vl3q7XsTDUHDyUFOtFVEYUGU7KCBfgIWWeNFb6ig9qnioEVMZBnVV2eoScFSaxE7PkYt1WeYHdkZaGr0xPv3csJxjhu+BOF3hVOK40HH0XhMYDbGQRSf5MqnAsvR3uKRG5IqHJWg= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702563224; 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; bh=p6euUAmroPjbhjKykrkgxUOPnGh6wL05pkTTSYD9C9o=; b=CxA2PmFwLWp0qsM3TquVqQz6wHSnsunGRLU98OTKrPKnuJ4byXvu7rFra7iJk58pBvBTtn 7vAz8zSrpH/+CarmkGdr8bPV7Mx8nR+fu1KhUCdPAyYqQv+zr7c2VJN/EJdAGsIrqNDUWu IM7nWeUDnCWslVlr0BxcpQO99hkhOBE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-104-wCDmAK8UM1G6HR3HVTJqsQ-1; Thu, 14 Dec 2023 09:13:43 -0500 X-MC-Unique: wCDmAK8UM1G6HR3HVTJqsQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id A8596185A783 for ; Thu, 14 Dec 2023 14:13:42 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.22.17.251]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6A48540C6EB9; Thu, 14 Dec 2023 14:13:42 +0000 (UTC) From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [pushed] analyzer: cleanups [PR112655] Date: Thu, 14 Dec 2023 09:13:40 -0500 Message-Id: <20231214141340.3301765-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785266961826790880 X-GMAIL-MSGID: 1785266961826790880 Avoid copying eedges in infinite_loop::infinite_loop. Use initializer lists in the various places reported in PR analyzer/112655 (apart from coord_test's ctor, which would require nontrivial refactoring). Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu. Pushed to trunk as r14-6549-g8cf5afba5dc482 gcc/analyzer/ChangeLog: PR analyzer/112655 * infinite-loop.cc (infinite_loop::infinite_loop): Pass eedges via rvalue reference rather than by value. (starts_infinite_loop_p): Move eedges when constructing an infinite_loop instance. * sm-file.cc (fileptr_state_machine::fileptr_state_machine): Use initializer list for states. * sm-sensitive.cc (sensitive_state_machine::sensitive_state_machine): Likewise. * sm-signal.cc (signal_state_machine::signal_state_machine): Likewise. * sm-taint.cc (taint_state_machine::taint_state_machine): Likewise. * varargs.cc (va_list_state_machine::va_list_state_machine): Likewise. --- gcc/analyzer/infinite-loop.cc | 8 ++++---- gcc/analyzer/sm-file.cc | 12 ++++++------ gcc/analyzer/sm-sensitive.cc | 6 +++--- gcc/analyzer/sm-signal.cc | 6 +++--- gcc/analyzer/sm-taint.cc | 12 ++++++------ gcc/analyzer/varargs.cc | 6 +++--- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/gcc/analyzer/infinite-loop.cc b/gcc/analyzer/infinite-loop.cc index c47ce1c89085..fc194d919cf3 100644 --- a/gcc/analyzer/infinite-loop.cc +++ b/gcc/analyzer/infinite-loop.cc @@ -71,7 +71,7 @@ struct infinite_loop { infinite_loop (const exploded_node &enode, location_t loc, - std::vector eedges, + std::vector &&eedges, logger *logger) : m_enode (enode), m_loc (loc), @@ -423,9 +423,9 @@ starts_infinite_loop_p (const exploded_node &enode, free (filename); } return ::make_unique (enode, - first_loc, - eedges, - logger); + first_loc, + std::move (eedges), + logger); } else { diff --git a/gcc/analyzer/sm-file.cc b/gcc/analyzer/sm-file.cc index f8e31f873a5a..323df23b1b71 100644 --- a/gcc/analyzer/sm-file.cc +++ b/gcc/analyzer/sm-file.cc @@ -270,13 +270,13 @@ private: /* fileptr_state_machine's ctor. */ fileptr_state_machine::fileptr_state_machine (logger *logger) -: state_machine ("file", logger) +: state_machine ("file", logger), + m_unchecked (add_state ("unchecked")), + m_null (add_state ("null")), + m_nonnull (add_state ("nonnull")), + m_closed (add_state ("closed")), + m_stop (add_state ("stop")) { - m_unchecked = add_state ("unchecked"); - m_null = add_state ("null"); - m_nonnull = add_state ("nonnull"); - m_closed = add_state ("closed"); - m_stop = add_state ("stop"); } /* Get a set of functions that are known to take a FILE * that must be open, diff --git a/gcc/analyzer/sm-sensitive.cc b/gcc/analyzer/sm-sensitive.cc index 4776d6465bb5..aea337cdccda 100644 --- a/gcc/analyzer/sm-sensitive.cc +++ b/gcc/analyzer/sm-sensitive.cc @@ -161,10 +161,10 @@ private: /* sensitive_state_machine's ctor. */ sensitive_state_machine::sensitive_state_machine (logger *logger) -: state_machine ("sensitive", logger) +: state_machine ("sensitive", logger), + m_sensitive (add_state ("sensitive")), + m_stop (add_state ("stop")) { - m_sensitive = add_state ("sensitive"); - m_stop = add_state ("stop"); } /* Warn about an exposure at NODE and STMT if ARG is in the "sensitive" diff --git a/gcc/analyzer/sm-signal.cc b/gcc/analyzer/sm-signal.cc index 6bca395ac5c7..799bae5364b8 100644 --- a/gcc/analyzer/sm-signal.cc +++ b/gcc/analyzer/sm-signal.cc @@ -182,10 +182,10 @@ private: /* signal_state_machine's ctor. */ signal_state_machine::signal_state_machine (logger *logger) -: state_machine ("signal", logger) +: state_machine ("signal", logger), + m_in_signal_handler (add_state ("in_signal_handler")), + m_stop (add_state ("stop")) { - m_in_signal_handler = add_state ("in_signal_handler"); - m_stop = add_state ("stop"); } /* Update MODEL for edges that simulate HANDLER_FUN being called as diff --git a/gcc/analyzer/sm-taint.cc b/gcc/analyzer/sm-taint.cc index 597e8e55609a..ce18957b56b8 100644 --- a/gcc/analyzer/sm-taint.cc +++ b/gcc/analyzer/sm-taint.cc @@ -830,13 +830,13 @@ private: /* taint_state_machine's ctor. */ taint_state_machine::taint_state_machine (logger *logger) -: state_machine ("taint", logger) +: state_machine ("taint", logger), + m_tainted (add_state ("tainted")), + m_has_lb (add_state ("has_lb")), + m_has_ub (add_state ("has_ub")), + m_stop (add_state ("stop")), + m_tainted_control_flow (add_state ("tainted-control-flow")) { - m_tainted = add_state ("tainted"); - m_has_lb = add_state ("has_lb"); - m_has_ub = add_state ("has_ub"); - m_stop = add_state ("stop"); - m_tainted_control_flow = add_state ("tainted-control-flow"); } state_machine::state_t diff --git a/gcc/analyzer/varargs.cc b/gcc/analyzer/varargs.cc index 7cdfb203a339..d505a80b06a0 100644 --- a/gcc/analyzer/varargs.cc +++ b/gcc/analyzer/varargs.cc @@ -241,10 +241,10 @@ private: /* va_list_state_machine's ctor. */ va_list_state_machine::va_list_state_machine (logger *logger) -: state_machine ("va_list", logger) +: state_machine ("va_list", logger), + m_started (add_state ("started")), + m_ended (add_state ("ended")) { - m_started = add_state ("started"); - m_ended = add_state ("ended"); } /* Implementation of the various "va_*" functions for