From patchwork Thu Jan 18 17:15:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 84360 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C31EE385828A for ; Thu, 18 Jan 2024 17:16:23 +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 A9A013858D38 for ; Thu, 18 Jan 2024 17:15:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A9A013858D38 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 A9A013858D38 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=1705598151; cv=none; b=qe1x41QKJKKMKjo/bDwIs0toNkNGO7IARympPWeEZ2FJl3jMANrcEsqCFjo+fujzt+GfY2/mGCLA49I717Yfe9VT6lxS05oJ+ZfUvRFONb0vz1ubrMrKkJsyIWlC/lxj3cFpi+6KD4P1r/yE8lbMht8ugWlxTXIAFi9EFZw7tYo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705598151; c=relaxed/simple; bh=4icqSwggx32vBW6egIi3kv0hSW5xbVXd2ul+NO1V3to=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=jjztIvt5eoQE+WKIChI7QGfrD9t9cQ6AHN6xtuYr4BKfQ86oblN8qheAjkS7kj0G7JATHXHzpFBZ+J/CIcXvg0R5IPpr5YF9GgkW/kqUSfiqdfEbRyyGOhVVjJvgOFA6RWxuQQsdo79gdBm3wzCI1svxMFOi0RetU/KwI0lHhoU= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705598149; 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=jgz0rJ3XNW24BIRGd8O1kxNs4hkyieKuflltvlVQ8+8=; b=Pa6zNqgB7P58c+HL03bTrckoRtJoCDsPdrryx1/COkQlmLg3RC/l2At8RgV/vb3qVpdsx7 6m+hyAzRe3K04C4v2wuxk7srl6bhL7D3E1Gw4BCWr2/ZpDW2dAxpDTTg1OaJ3lt+a6P6yg v8u6nRNPat7owjIuiq5fPO7h8ZAAwhc= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-320-BT6F-eVpMD6i7UkV7IYvMg-1; Thu, 18 Jan 2024 12:15:47 -0500 X-MC-Unique: BT6F-eVpMD6i7UkV7IYvMg-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (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 AD83A29AA38D for ; Thu, 18 Jan 2024 17:15:47 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.22.32.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7FA4A1C02EB3; Thu, 18 Jan 2024 17:15:47 +0000 (UTC) From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [pushed] analyzer: fix ICE on strlen ((char *)&VECTOR_CST) [PR111361] Date: Thu, 18 Jan 2024 12:15:46 -0500 Message-Id: <20240118171546.1216545-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.6 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+patchwork=sourceware.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-8257-gd5604febcfb094. gcc/analyzer/ChangeLog: PR analyzer/111361 * region-model.cc (svalue_byte_range_has_null_terminator_1): The initial byte of an all-zeroes SVAL is a zero byte. Remove gcc_unreachable from SK_CONSTANT for constants that aren't STRING_CST or INTEGER_CST. gcc/testsuite/ChangeLog: PR analyzer/111361 * c-c++-common/analyzer/strlen-pr111361.c: New test. * c-c++-common/analyzer/strncpy-1.c (test_zero_fill): Remove fixed xfail. * c-c++-common/analyzer/strncpy-pr111361.c: New test. Signed-off-by: David Malcolm --- gcc/analyzer/region-model.cc | 9 ++++++++- .../c-c++-common/analyzer/strlen-pr111361.c | 18 ++++++++++++++++++ .../c-c++-common/analyzer/strncpy-1.c | 3 +-- .../c-c++-common/analyzer/strncpy-pr111361.c | 8 ++++++++ 4 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/c-c++-common/analyzer/strlen-pr111361.c create mode 100644 gcc/testsuite/c-c++-common/analyzer/strncpy-pr111361.c diff --git a/gcc/analyzer/region-model.cc b/gcc/analyzer/region-model.cc index f01010cf630..dbb2149dbd4 100644 --- a/gcc/analyzer/region-model.cc +++ b/gcc/analyzer/region-model.cc @@ -3605,6 +3605,14 @@ svalue_byte_range_has_null_terminator_1 (const svalue *sval, byte_offset_t *out_bytes_read, logger *logger) { + if (bytes.m_start_byte_offset == 0 + && sval->all_zeroes_p ()) + { + /* The initial byte of an all-zeroes SVAL is a zero byte. */ + *out_bytes_read = 1; + return tristate (true); + } + switch (sval->get_kind ()) { case SK_CONSTANT: @@ -3631,7 +3639,6 @@ svalue_byte_range_has_null_terminator_1 (const svalue *sval, return tristate::TS_UNKNOWN; default: - gcc_unreachable (); break; } } diff --git a/gcc/testsuite/c-c++-common/analyzer/strlen-pr111361.c b/gcc/testsuite/c-c++-common/analyzer/strlen-pr111361.c new file mode 100644 index 00000000000..b3b875c5a97 --- /dev/null +++ b/gcc/testsuite/c-c++-common/analyzer/strlen-pr111361.c @@ -0,0 +1,18 @@ +#include "analyzer-decls.h" + +typedef int __attribute__((__vector_size__ (32))) V; + +typedef __SIZE_TYPE__ size_t; + +static size_t __attribute__((noinline)) +call_strlen (const char *p) +{ + return __builtin_strlen (p); +} + +void +foo (void *out) +{ + V v = (V) { }; + __analyzer_eval (call_strlen ((const char *)&v) == 0); /* { dg-warning "TRUE" } */ +} diff --git a/gcc/testsuite/c-c++-common/analyzer/strncpy-1.c b/gcc/testsuite/c-c++-common/analyzer/strncpy-1.c index 3ca1d81d90c..8edaf26654d 100644 --- a/gcc/testsuite/c-c++-common/analyzer/strncpy-1.c +++ b/gcc/testsuite/c-c++-common/analyzer/strncpy-1.c @@ -44,8 +44,7 @@ test_zero_fill (char *dst) __analyzer_eval (dst[4] == '\0'); /* { dg-warning "TRUE" "correct" { xfail *-*-* } } */ /* { dg-bogus "UNKNOWN" "status quo" { xfail *-*-* } .-1 } */ __analyzer_eval (__analyzer_get_strlen (dst) == 0); /* { dg-warning "TRUE" } */ - __analyzer_eval (__analyzer_get_strlen (dst + 1) == 0); /* { dg-warning "TRUE" "correct" { xfail *-*-* } } */ - /* { dg-bogus "UNKNOWN" "status quo" { xfail *-*-* } .-1 } */ + __analyzer_eval (__analyzer_get_strlen (dst + 1) == 0); /* { dg-warning "TRUE" } */ } char *test_unterminated_concrete_a (char *dst) diff --git a/gcc/testsuite/c-c++-common/analyzer/strncpy-pr111361.c b/gcc/testsuite/c-c++-common/analyzer/strncpy-pr111361.c new file mode 100644 index 00000000000..da3eaeb6edb --- /dev/null +++ b/gcc/testsuite/c-c++-common/analyzer/strncpy-pr111361.c @@ -0,0 +1,8 @@ +typedef int __attribute__((__vector_size__ (32))) V; + +void +foo (char *out) +{ + V v = (V) { }; + __builtin_strncpy (out, (char *)&v, 5); +}