From patchwork Fri Dec 8 00:45:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 175492 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp5160708vqy; Thu, 7 Dec 2023 16:45:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IHzaFWEAix0VqqdxMmcAGOvsSqLMl2rhyM5OsSkp6r2RVb4HVw+ImF7WCVm6oafaBZVeuXJ X-Received: by 2002:a05:6808:1923:b0:3b9:db67:4dd4 with SMTP id bf35-20020a056808192300b003b9db674dd4mr2663882oib.83.1701996357225; Thu, 07 Dec 2023 16:45:57 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1701996357; cv=pass; d=google.com; s=arc-20160816; b=n9MZX0j/jDsRDveR8J8rX1BfZGuFFHYQSZDYhvndLdT2Xi90YaieHCQ4z0TUTHZJ1L fjyMTbOVKR2FFBlMXCDroR40SJ8C4JnYspzw01Ho+SVAuMX7fGEMIHaipLJO89N1JOyD L7ivdGuqaou4aolz8ZLa2NLtCqxD6e1KFhvFH6fBJypFF6PChI4E7zbYRYPGdC+9iAP0 0bI21OvW9FQ7BGMz/syEBTtnLc5xuDB0KyJ1Lb1n7fpiT1SQz2Ha0vBX9mbo0f/MYjgE YoR0FigWvqefyouboFaCB3891eNu+WHv9gN0/kMyDvBpgT6Uq+3mjcRrSoNwCrLYqBmk /Rlg== 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=t9Pz7jp7ZR24SVTMvqrvtZx8UKehwa+3W7AKN3Y06K4=; fh=NXemEfxTRbZtBxUkxR2ehQUaYlcDfMdzPkO8MChVQE4=; b=F2Y66HTvFFZAn81x7BvQRkeRtMq+aOkmF5l3ly/mtP6Yo+xGGwu9Xia/KprqXtdGeb iobTVEkAnkOQUEYw86qj8NjCZiYaQNI95IjDOyUAN/eXMgbynxjAoJ2Zm02NgS+/TT/K dd7FF1eafNw32UABZ7VebfXLLF7XruJne77tu1MXU+0dXY5XCeykgtTmrtAyEt4CvkOu R81SapJnnu6f6VqaQRbvSr6OALpIsYqSoRZR8nc93IPGv10XnE4Iitl8fNn/tEpIUkHg xBfhRoVlTd7olNjUdXIHg2oz+2e1BQaXw92PrELebgS4gS/LYcGXb687QDWo3yWX/vic DVHw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=O4KiqV5K; arc=pass (i=1); 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=redhat.com Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id p1-20020a05622a00c100b00423e1bd3051si1146657qtw.650.2023.12.07.16.45.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 16:45:57 -0800 (PST) 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=@redhat.com header.s=mimecast20190719 header.b=O4KiqV5K; arc=pass (i=1); 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=redhat.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F1C213858D39 for ; Fri, 8 Dec 2023 00:45:56 +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 8E21D3858D39 for ; Fri, 8 Dec 2023 00:45:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8E21D3858D39 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 8E21D3858D39 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=1701996334; cv=none; b=gPOtAu6mqXdWsr5KeqNK1UqIkz2KWVF8sY7skjL3X+CAXwxmY1s6i88PYslLAmhlV1xxyE+UKWv48nda6vXjEAia8/wzAAPQKcgJxR5bnGpgXcvuQNtVQh7G8jHkm2pon3VOsE541FeBFPqxVjNgUmjz76tQs8TiMEj8VmUM08k= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701996334; c=relaxed/simple; bh=vT5PgSaQ3QvIuYbGSxKhCtfIgzA/+Bix0426D2SWbhI=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=pFnTkWo2dwjhZuJo4PyW9Pw/CpHuSFPdXnjDddFuCQCBQFY7+lBzc/FAOmbC6i74fKEUeSkuPbh3d9dzHiKeGyA9VOUbWLd02iQgxgfWAzZSzVKx3j4J+NvxI5MNdRrh22G+eGjeX/bBQ/HtqPFhywOs2E+1hK8RvU6bgoZ/dDk= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701996332; 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=t9Pz7jp7ZR24SVTMvqrvtZx8UKehwa+3W7AKN3Y06K4=; b=O4KiqV5KyrSCPwG0HGr3UYI/13/YkrKLG5lvgvR+5XAQXHbxlvzxCbRa5xhCRi+tkS3qzb OyMWPNFbBC5eEEKf7Mcj07S6FkmZ8PJ7cfSpLVi68WtNdaPXt2OdMbpBuhBUAkb+sCH6Ng 9dHeWPqwQ8b+GuJ0C7nuCYFNxcUBg/Q= 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-270-LzKKc2BbNH-UPOPXu_QfyA-1; Thu, 07 Dec 2023 19:45:30 -0500 X-MC-Unique: LzKKc2BbNH-UPOPXu_QfyA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (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 9EDC08352A0 for ; Fri, 8 Dec 2023 00:45:30 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.22.33.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id 77BD18CD0; Fri, 8 Dec 2023 00:45:30 +0000 (UTC) From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [pushed] analyzer: fix ICE for 2 bits before the start of base region [PR112889] Date: Thu, 7 Dec 2023 19:45:29 -0500 Message-Id: <20231208004529.2612209-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 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: 1784672532546008887 X-GMAIL-MSGID: 1784672532546008887 Cncrete bindings were using -1 and -2 in the offset field to signify deleted and empty hash slots, but these are valid values, leading to assertion failures inside hash_map::put on a debug build, and probable bugs in a release build. (gdb) call k.dump(true) start: -2, size: 1, next: -1 (gdb) p k.is_empty() $6 = true Fix by using the size field rather than the offset. Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu. Successful run of analyzer integration tests on x86_64-pc-linux-gnu. Pushed to trunk as r14-6297-g775aeabcb870b7. gcc/analyzer/ChangeLog: PR analyzer/112889 * store.h (concrete_binding::concrete_binding): Strengthen assertion to require size to be be positive, rather than just non-zero. (concrete_binding::mark_deleted): Use size rather than start bit offset. (concrete_binding::mark_empty): Likewise. (concrete_binding::is_deleted): Likewise. (concrete_binding::is_empty): Likewise. gcc/testsuite/ChangeLog: PR analyzer/112889 * c-c++-common/analyzer/ice-pr112889.c: New test. --- gcc/analyzer/store.h | 10 +++++----- .../c-c++-common/analyzer/ice-pr112889.c | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/c-c++-common/analyzer/ice-pr112889.c diff --git a/gcc/analyzer/store.h b/gcc/analyzer/store.h index cf10fa3b010..d75d69d0b7f 100644 --- a/gcc/analyzer/store.h +++ b/gcc/analyzer/store.h @@ -377,7 +377,7 @@ public: concrete_binding (bit_offset_t start_bit_offset, bit_size_t size_in_bits) : m_bit_range (start_bit_offset, size_in_bits) { - gcc_assert (!m_bit_range.empty_p ()); + gcc_assert (m_bit_range.m_size_in_bits > 0); } bool concrete_p () const final override { return true; } @@ -419,10 +419,10 @@ public: static int cmp_ptr_ptr (const void *, const void *); - void mark_deleted () { m_bit_range.m_start_bit_offset = -1; } - void mark_empty () { m_bit_range.m_start_bit_offset = -2; } - bool is_deleted () const { return m_bit_range.m_start_bit_offset == -1; } - bool is_empty () const { return m_bit_range.m_start_bit_offset == -2; } + void mark_deleted () { m_bit_range.m_size_in_bits = -1; } + void mark_empty () { m_bit_range.m_size_in_bits = -2; } + bool is_deleted () const { return m_bit_range.m_size_in_bits == -1; } + bool is_empty () const { return m_bit_range.m_size_in_bits == -2; } private: bit_range m_bit_range; diff --git a/gcc/testsuite/c-c++-common/analyzer/ice-pr112889.c b/gcc/testsuite/c-c++-common/analyzer/ice-pr112889.c new file mode 100644 index 00000000000..e90a53e79ba --- /dev/null +++ b/gcc/testsuite/c-c++-common/analyzer/ice-pr112889.c @@ -0,0 +1,17 @@ +typedef unsigned char __u8; +struct sk_buff +{ + unsigned char *data; +}; +struct cpl_pass_accept_req +{ + __u8 : 6; + __u8 sack : 1; +}; +void build_cpl_pass_accept_req(struct sk_buff* skb) +{ + struct cpl_pass_accept_req* req; + skb->data -= sizeof(*req); + req = (struct cpl_pass_accept_req *)skb->data; + req->sack = 1; +}