From patchwork Wed Dec 14 21:09:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 33374 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp468610wrn; Wed, 14 Dec 2022 13:10:33 -0800 (PST) X-Google-Smtp-Source: AA0mqf7oLvfj/cRdb6HQrNffJvM1v8+Wo58UtWPycCunAQn2U1k4VgxAVquuC0IyqcHrNUgHTsrg X-Received: by 2002:a17:906:6c8e:b0:7c1:1005:46e1 with SMTP id s14-20020a1709066c8e00b007c1100546e1mr21850304ejr.69.1671052232982; Wed, 14 Dec 2022 13:10:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671052232; cv=none; d=google.com; s=arc-20160816; b=Uh/4/vdufIZkq/QkL/XIWIlnNoUGBjXv9Z0/sZUkY6AtBhU7xV3+QTWZvORWzlrYUT hn9fvPabgaEZECaPOhzm6fikb3a4ME4IifDtnbHF+05kJOUHmjPDC7XMp1K/+eb3xqbA dGH3dWxQL4LuWY/yai9MX3pCy9Elw4u3No+7NZWP9hUQ6GG/Eh9yd/zBdnDjekWM4Jzs P1Mzs6sq4QAbS7e37Txe1kUMvKD0hg2OC4oGfY/IeHCoJpybHmjo3eyyM+GWXIXNxiXH 1kpDGt51Jbb4D8u0p8XTyb+0jSGjLbMaNOXcTlUBY8L9J6+OyXBrgoAI1BJf5SJR4Bs0 Fttg== 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:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=VLUmg+qbBLrco/+R687EXG95GD6iPc8ZBAdJ/tBlJhI=; b=uOkTsM2ekqNwHoFHmbY1VEQotAQviTwr9DoAf06HQOnz/hyAPabMgXkeDEXIuPfcoK /ID65+6ZuLqkxB82TvnlPidCBPJcpt3F3LEX5Ip3DJKmAchpf2UEKsIgr6FBQ+NB/j4b 45NcM/mhW16rwqQoubNHAKTdCJL/QVvjEKhTLi3r5U4omxgFlGt4Llay/At5CoWIGppP xMvwZe1/gGfMvQVkRQZ9+JrrU1IpDin601jOwxgLq2jbd4nKZO95dTLxqOKNztwsKSKh 5EeqZMRxiwdX7xl8jpvgHHWsbkLjYyU46hzDtd4m0kbwlTlSdHKD8Pm1/tK8ooLw7bfo SDcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=K6wHwb9x; 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=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id hr7-20020a1709073f8700b007c0f90f0b6bsi12580699ejc.991.2022.12.14.13.10.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Dec 2022 13:10:32 -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=@gcc.gnu.org header.s=default header.b=K6wHwb9x; 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=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C11A2383F0BB for ; Wed, 14 Dec 2022 21:10:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C11A2383F0BB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1671052227; bh=VLUmg+qbBLrco/+R687EXG95GD6iPc8ZBAdJ/tBlJhI=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=K6wHwb9x2YsHylRUqwerG8x+4x33/fZLwdS4+LFzSjBEkW81l8KcD741+UN5ZXK97 SIrs0snADfBfqjAS9pHMXWl9iW0TCjF1QWeYmqsUTGKXz6Tuqc3Mw5MDnvMDtVtvU7 R/koc226gFQoOJegY79K8Deb5NRY4dRzK10fdsRA= 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 97528383FF63 for ; Wed, 14 Dec 2022 21:09:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 97528383FF63 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-425-7FMkXu3uNrmM-FtJB-6Sfw-1; Wed, 14 Dec 2022 16:09:40 -0500 X-MC-Unique: 7FMkXu3uNrmM-FtJB-6Sfw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 55E58886463 for ; Wed, 14 Dec 2022 21:09:40 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.2.17.99]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1FB5740C2004; Wed, 14 Dec 2022 21:09:40 +0000 (UTC) To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [committed] analyzer: don't call binding_key::make on empty regions [PR108065] Date: Wed, 14 Dec 2022 16:09:38 -0500 Message-Id: <20221214210938.356311-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.5 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?1752225266488144201?= X-GMAIL-MSGID: =?utf-8?q?1752225266488144201?= Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu. Pushed to trunk as r13-4710-g41faa1d7beb90b. gcc/analyzer/ChangeLog: PR analyzer/108065 * region.cc (decl_region::get_svalue_for_initializer): Bail out to avoid calling binding_key::make with an empty region. * store.cc (binding_map::apply_ctor_val_to_range): Likewise. (binding_map::apply_ctor_pair_to_child_region): Likewise. (binding_cluster::bind): Likewise. (binding_cluster::purge_region): Likewise. (binding_cluster::maybe_get_compound_binding): Likewise. (binding_cluster::maybe_get_simple_value): Likewise. gcc/testsuite/ChangeLog: PR analyzer/108065 * gfortran.dg/analyzer/pr108065.f90: New test. Signed-off-by: David Malcolm --- gcc/analyzer/region.cc | 3 +++ gcc/analyzer/store.cc | 14 ++++++++++++++ gcc/testsuite/gfortran.dg/analyzer/pr108065.f90 | 17 +++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/analyzer/pr108065.f90 diff --git a/gcc/analyzer/region.cc b/gcc/analyzer/region.cc index 67ba9486980..83809d6e1c3 100644 --- a/gcc/analyzer/region.cc +++ b/gcc/analyzer/region.cc @@ -1208,6 +1208,9 @@ decl_region::get_svalue_for_initializer (region_model_manager *mgr) const if (DECL_EXTERNAL (m_decl)) return NULL; + if (empty_p ()) + return NULL; + /* Implicit initialization to zero; use a compound_svalue for it. Doing so requires that we have a concrete binding for this region, which can fail if we have a region with unknown size diff --git a/gcc/analyzer/store.cc b/gcc/analyzer/store.cc index dd8ebaa7374..f3b500c50a0 100644 --- a/gcc/analyzer/store.cc +++ b/gcc/analyzer/store.cc @@ -911,6 +911,8 @@ binding_map::apply_ctor_val_to_range (const region *parent_reg, return false; bit_offset_t start_bit_offset = min_offset.get_bit_offset (); store_manager *smgr = mgr->get_store_manager (); + if (max_element->empty_p ()) + return false; const binding_key *max_element_key = binding_key::make (smgr, max_element); if (max_element_key->symbolic_p ()) return false; @@ -950,6 +952,8 @@ binding_map::apply_ctor_pair_to_child_region (const region *parent_reg, else { const svalue *sval = get_svalue_for_ctor_val (val, mgr); + if (child_reg->empty_p ()) + return false; const binding_key *k = binding_key::make (mgr->get_store_manager (), child_reg); /* Handle the case where we have an unknown size for child_reg @@ -1347,6 +1351,8 @@ binding_cluster::bind (store_manager *mgr, return; } + if (reg->empty_p ()) + return; const binding_key *binding = binding_key::make (mgr, reg); bind_key (binding, sval); } @@ -1419,6 +1425,8 @@ void binding_cluster::purge_region (store_manager *mgr, const region *reg) { gcc_assert (reg->get_kind () == RK_DECL); + if (reg->empty_p ()) + return; const binding_key *binding = binding_key::make (mgr, const_cast (reg)); m_map.remove (binding); @@ -1666,6 +1674,9 @@ binding_cluster::maybe_get_compound_binding (store_manager *mgr, if (reg_offset.symbolic_p ()) return NULL; + if (reg->empty_p ()) + return NULL; + region_model_manager *sval_mgr = mgr->get_svalue_manager (); /* We will a build the result map in two parts: @@ -2162,6 +2173,9 @@ binding_cluster::maybe_get_simple_value (store_manager *mgr) const if (m_map.elements () != 1) return NULL; + if (m_base_region->empty_p ()) + return NULL; + const binding_key *key = binding_key::make (mgr, m_base_region); return get_any_value (key); } diff --git a/gcc/testsuite/gfortran.dg/analyzer/pr108065.f90 b/gcc/testsuite/gfortran.dg/analyzer/pr108065.f90 new file mode 100644 index 00000000000..86ba4d4f9aa --- /dev/null +++ b/gcc/testsuite/gfortran.dg/analyzer/pr108065.f90 @@ -0,0 +1,17 @@ +! { dg-do compile } +! { dg-additional-options "-fcheck=bounds -Wno-analyzer-malloc-leak" } +! Copy of gfortran.dg/bounds_check_23.f90 +! as a regression test for ICE with -fanalyzer (PR analyzer/108065) + +program test + implicit none + call sub('Lorem ipsum') +contains + subroutine sub( text ) + character(len=*), intent(in) :: text + character(len=1), allocatable :: c(:) + integer :: i + c = [ ( text(i:i), i = 1, len(text) ) ] + if (c(1) /= 'L') stop 1 + end subroutine sub +end program test