From patchwork Thu Aug 24 14:38:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 136832 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp1167617vqm; Thu, 24 Aug 2023 07:41:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHBFJe+AlW3IR8GemYaIQ1S1VFUt+gK9YL2mTG0fTwKD/5Gh/eiaWfW6AgId3K9yoNbjY7V X-Received: by 2002:ac2:5b5b:0:b0:500:8fe8:7e82 with SMTP id i27-20020ac25b5b000000b005008fe87e82mr5691162lfp.68.1692888070117; Thu, 24 Aug 2023 07:41:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692888070; cv=none; d=google.com; s=arc-20160816; b=GpuvD8neyz0E7cqkUERTS84s4UBvKq2ynIofbKWxsqgBUG9qsdpc0JUMcNKAYkw3HJ vbXl+xzqKDvpiRq9Pi3kOSVZP7LpFQRXy89wG3PtcH53CJEe7l6s26EXYtam0QLIsjF4 BU+ursDUnFv8Dy2YtLg/1H0/0fWyUe+YXX7Q9uvezaIhmxppMFeHWuWBql3Jqwzc1a3R A74mj1JdX5gMV33BI4wmWg9Hl8+5GZvUypoOt5rzgcEbpzXe7p/6eoRKp3ZclaMjlm3L Ffh6yQWA5bQVwOyStH6qJ+/m0Cxbo5ma7eUibzTt7YpIAeGGQsqbR7cAKQo6b7xkDeF1 DSOQ== 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:cc:to:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=7edK7MlF4oycdMXkbYFPByfq2+FNJgBE9s336N7/nJs=; fh=fa0YJSH7y4k0snNuxsKgOI6vGP7j2f0jR9F1WHC95UA=; b=DsuDhGla3TSY3OeBXvGjIAl/PDcYJUTaNVW6PzVVTOOy/FZ0Bsp8R+85GZbvw73Pj1 ZpMUW8Zz7BwYRugfI9B3Ix6N4fL8PVD9Lg1oEGsNnbtL47piFzyJo2/sByiMD5uIWd7r rJDH4IhNgt54jUqCj9V7H4zWV1p2WhJYkHOQCcZWslVhKQUyhIVWA4jFp7Twj3nUly+D XHgFadk+AE8C/Qa/+uHlLJTsF/v1/4LTW3/r0ZzZoEv0VTuUmWPSuNKstHJv3W6OMmvw 3+hBmxWiRZN2jGaOnOwd1tjicOt6jNmU+WVXw1j4SpNa/x7QB2uolLHrXw+1srRyal5S O+bQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=JT3OsTrf; 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 (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id m23-20020aa7d357000000b0052a3c4c5be4si2201138edr.48.2023.08.24.07.41.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Aug 2023 07:41: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=JT3OsTrf; 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 4A1D83853D02 for ; Thu, 24 Aug 2023 14:39:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4A1D83853D02 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1692887999; bh=7edK7MlF4oycdMXkbYFPByfq2+FNJgBE9s336N7/nJs=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=JT3OsTrfFDAnM7V61oKWDO+42Oh/hHiBXKdOBUhDBbT+ZYwWPB4kgiFk1377in9qn GMLLGe79vncUq+Bg6lUr5PAxtu7badOAd9WDa36+aiV+lyBGyh11xfa1r6WBr5NbyW hZGe30oJbw19sboJgmts+j3FJQGCzumcU+Bt5mnc= 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 807CF3858402 for ; Thu, 24 Aug 2023 14:39:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 807CF3858402 Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-70-jGCT9VwTNmuwjYnci6peuQ-1; Thu, 24 Aug 2023 10:39:06 -0400 X-MC-Unique: jGCT9VwTNmuwjYnci6peuQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A40F02807D62 for ; Thu, 24 Aug 2023 14:39:06 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.22.32.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 80B5D40D2839; Thu, 24 Aug 2023 14:39:06 +0000 (UTC) To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [PATCH 4/9] analyzer: eliminate region_model::get_string_size [PR105899] Date: Thu, 24 Aug 2023 10:38:58 -0400 Message-Id: <20230824143903.3161185-5-dmalcolm@redhat.com> In-Reply-To: <20230824143903.3161185-1-dmalcolm@redhat.com> References: <20230824143903.3161185-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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_H4, 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.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: INBOX X-GMAIL-THRID: 1775121800687857519 X-GMAIL-MSGID: 1775121800687857519 gcc/analyzer/ChangeLog: PR analyzer/105899 * region-model.cc (region_model::get_string_size): Delete both. * region-model.h (region_model::get_string_size): Delete both decls. --- gcc/analyzer/region-model.cc | 29 ----------------------------- gcc/analyzer/region-model.h | 3 --- 2 files changed, 32 deletions(-) diff --git a/gcc/analyzer/region-model.cc b/gcc/analyzer/region-model.cc index cc8d895d9665..1fe66f4719fa 100644 --- a/gcc/analyzer/region-model.cc +++ b/gcc/analyzer/region-model.cc @@ -2794,35 +2794,6 @@ region_model::get_capacity (const region *reg) const return m_mgr->get_or_create_unknown_svalue (sizetype); } -/* Return the string size, including the 0-terminator, if SVAL is a - constant_svalue holding a string. Otherwise, return an unknown_svalue. */ - -const svalue * -region_model::get_string_size (const svalue *sval) const -{ - tree cst = sval->maybe_get_constant (); - if (!cst || TREE_CODE (cst) != STRING_CST) - return m_mgr->get_or_create_unknown_svalue (size_type_node); - - tree out = build_int_cst (size_type_node, TREE_STRING_LENGTH (cst)); - return m_mgr->get_or_create_constant_svalue (out); -} - -/* Return the string size, including the 0-terminator, if REG is a - string_region. Otherwise, return an unknown_svalue. */ - -const svalue * -region_model::get_string_size (const region *reg) const -{ - const string_region *str_reg = dyn_cast (reg); - if (!str_reg) - return m_mgr->get_or_create_unknown_svalue (size_type_node); - - tree cst = str_reg->get_string_cst (); - tree out = build_int_cst (size_type_node, TREE_STRING_LENGTH (cst)); - return m_mgr->get_or_create_constant_svalue (out); -} - /* If CTXT is non-NULL, use it to warn about any problems accessing REG, using DIR to determine if this access is a read or write. Return TRUE if an OOB access was detected. diff --git a/gcc/analyzer/region-model.h b/gcc/analyzer/region-model.h index 9c6e60bbe824..41df1885ad5b 100644 --- a/gcc/analyzer/region-model.h +++ b/gcc/analyzer/region-model.h @@ -469,9 +469,6 @@ class region_model const svalue *get_capacity (const region *reg) const; - const svalue *get_string_size (const svalue *sval) const; - const svalue *get_string_size (const region *reg) const; - bool replay_call_summary (call_summary_replay &r, const region_model &summary);