From patchwork Wed Feb 21 00:48:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 1901773 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=RWHjUOPK; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Tfd2436vKz23d2 for ; Wed, 21 Feb 2024 11:48:58 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 51A033858C2C for ; Wed, 21 Feb 2024 00:48: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 1A20B3858D20 for ; Wed, 21 Feb 2024 00:48:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1A20B3858D20 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 1A20B3858D20 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=1708476515; cv=none; b=YJhGsww9Wtr7vxJLSG8yiTxQY1qZMpSmYNPF7XPBTAMXzPPUSto69piysbT/CC7bWKPC2l28qSBl2NMRUqAK1CJpLrevl819E8ooA3WPY/HpDfyDK179rU9C0NGRdgv8+9/ujTZgpRZ6xQNaDJ5uNB0RO+uFd+K1IbSuUVqE40c= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708476515; c=relaxed/simple; bh=qzgc5fMiFBjWHZc0sBDONnZtpgvNjp/40ziBq8pmooM=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=hIf6pNxqZFD7Wt9YPmQHiSfO/v8tM4oQUyyFVAZqiVjgPbKqfrvpSS36QnkUijoXmiVjljVGLgy+kw6RajLdp/UVsrzGpTuP/aKet3/IwuuvNqqQh6Ph4kGFf3ZDIE1qukJdUH0CKrH20TCNwVQ87M2vzVW78W+YwmYObnKRl/I= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708476512; 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=V0EP0nKardmcno0prefzAwAX+oVBkaqvUAoPuFMgtWE=; b=RWHjUOPK56UODFlF0TJIIXe51FbRPZkgBr7mKNaoJKgM44N6aDSIocIqm/qmKRhPVZNNDx 99g/hk41HsCP8Pb82ACJsLq5row7/kDCJRs51nVsJXucFNmInY7orPrroYCMxFK2hGxByS 0TklmxcAAX/RvspDzpZ3hiioRcx/pyE= 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-650-bX2FluwiPQGO-e5h9j6xrg-1; Tue, 20 Feb 2024 19:48:31 -0500 X-MC-Unique: bX2FluwiPQGO-e5h9j6xrg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 3702485A58B for ; Wed, 21 Feb 2024 00:48:31 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.22.16.122]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F5081121306; Wed, 21 Feb 2024 00:48:31 +0000 (UTC) From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [pushed] analyzer: handle empty ranges in symbolic_byte_range::intersection [PR113998] Date: Tue, 20 Feb 2024 19:48:29 -0500 Message-Id: <20240221004829.3131912-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 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_H4, 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+incoming=patchwork.ozlabs.org@gcc.gnu.org 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-9090-g79d4c7ddc83e00. gcc/analyzer/ChangeLog: PR analyzer/113998 * ranges.cc (symbolic_byte_range::intersection): Handle empty ranges. (selftest::test_intersects): Add test coverage for empty ranges. gcc/testsuite/ChangeLog: PR analyzer/113998 * c-c++-common/analyzer/overlapping-buffers-pr113998.c: New test. Signed-off-by: David Malcolm --- gcc/analyzer/ranges.cc | 18 ++++++++++++++++ .../analyzer/overlapping-buffers-pr113998.c | 21 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 gcc/testsuite/c-c++-common/analyzer/overlapping-buffers-pr113998.c diff --git a/gcc/analyzer/ranges.cc b/gcc/analyzer/ranges.cc index f46b04121d3f..ffdd0d4c5722 100644 --- a/gcc/analyzer/ranges.cc +++ b/gcc/analyzer/ranges.cc @@ -193,6 +193,12 @@ tristate symbolic_byte_range::intersection (const symbolic_byte_range &other, const region_model &model) const { + /* If either is empty, then there is no intersection. */ + if (empty_p ()) + return tristate::TS_FALSE; + if (other.empty_p ()) + return tristate::TS_FALSE; + /* For brevity, consider THIS to be "range A", and OTHER to be "range B". */ region_model_manager *mgr = model.get_manager (); @@ -262,12 +268,17 @@ static void test_intersects (void) ASSERT_EQ (r0_9.get_next_byte_offset (mgr), ten); ASSERT_EQ (r0_9.get_last_byte_offset (mgr), nine); + symbolic_byte_range concrete_empty (zero, zero); + ASSERT_TRUE (concrete_empty.empty_p ()); + ASSERT_EQ (r0_9.intersection (r0, m), tristate::TS_TRUE); ASSERT_EQ (r0.intersection (r0_9, m), tristate::TS_TRUE); ASSERT_EQ (r0_9.intersection (r9, m), tristate::TS_TRUE); ASSERT_EQ (r9.intersection (r0_9, m), tristate::TS_TRUE); ASSERT_EQ (r0_9.intersection (r10, m), tristate::TS_FALSE); ASSERT_EQ (r10.intersection (r0_9, m), tristate::TS_FALSE); + ASSERT_EQ (concrete_empty.intersection (r0_9, m), tristate::TS_FALSE); + ASSERT_EQ (r0_9.intersection (concrete_empty, m), tristate::TS_FALSE); ASSERT_EQ (r5_9.intersection (r0, m), tristate::TS_FALSE); ASSERT_EQ (r0.intersection (r5_9, m), tristate::TS_FALSE); @@ -286,6 +297,9 @@ static void test_intersects (void) symbolic_byte_range ry (y_init_sval, one); symbolic_byte_range rx_x_plus_y_minus_1 (x_init_sval, y_init_sval); + symbolic_byte_range symbolic_empty (x_init_sval, zero); + ASSERT_TRUE (symbolic_empty.empty_p ()); + ASSERT_EQ (rx_x_plus_y_minus_1.get_start_byte_offset (), x_init_sval); ASSERT_EQ (rx_x_plus_y_minus_1.get_size_in_bytes (), y_init_sval); ASSERT_EQ @@ -296,6 +310,10 @@ static void test_intersects (void) SK_BINOP); ASSERT_EQ (rx.intersection (ry, m), tristate::TS_UNKNOWN); + ASSERT_EQ (rx.intersection (concrete_empty, m), tristate::TS_FALSE); + ASSERT_EQ (concrete_empty.intersection (rx, m), tristate::TS_FALSE); + ASSERT_EQ (rx.intersection (symbolic_empty, m), tristate::TS_FALSE); + ASSERT_EQ (symbolic_empty.intersection (rx, m), tristate::TS_FALSE); ASSERT_EQ (r0_x_minus_1.intersection (r0, m), tristate::TS_TRUE); #if 0 ASSERT_EQ (r0_x_minus_1.intersection (rx, m), tristate::TS_FALSE); diff --git a/gcc/testsuite/c-c++-common/analyzer/overlapping-buffers-pr113998.c b/gcc/testsuite/c-c++-common/analyzer/overlapping-buffers-pr113998.c new file mode 100644 index 000000000000..5c6352eb42f4 --- /dev/null +++ b/gcc/testsuite/c-c++-common/analyzer/overlapping-buffers-pr113998.c @@ -0,0 +1,21 @@ +/* Verify we don't ICE on -Wanalyzer-overlapping-buffers on + execution paths where the size is constant zero, but the + optimizer didn't see that. */ + +typedef __SIZE_TYPE__ size_t; + +extern char a[]; +size_t n; + +size_t __attribute__((noinline)) +get_hidden_zero () +{ + return 0; +} + +void +test_pr113998 () +{ + size_t n = get_hidden_zero (); + __builtin_strncpy (a, a, n); /* { dg-warning "overlapping buffers passed as arguments to" } */ +}