From patchwork Wed Mar 27 22:29:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 1917050 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=WODfZ4kh; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; 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 [8.43.85.97]) (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 4V4hG53YFJz1yWv for ; Thu, 28 Mar 2024 09:30:53 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 890343858C31 for ; Wed, 27 Mar 2024 22:30:51 +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.129.124]) by sourceware.org (Postfix) with ESMTPS id 705FB385E45D for ; Wed, 27 Mar 2024 22:29:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 705FB385E45D 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 705FB385E45D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711578604; cv=none; b=mjef1f0iLl3xBmH/wWo6ld1uVQNVA3efYWenemWaikNEviIuDWiX9AXyhV7ESmc1oToryTpYMqLuHjmtoxyzSe7a/2eZWPZR93Z8Hd4LJbKXqaGl8svnSOYsMGelcFwkb+/WgB4pUE6zb2lgMa2oISADrsQXVgFLcE1Zrd1s1a0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711578604; c=relaxed/simple; bh=9I5A9DwNarrHQxyi/AR7QunFUXT8jPWdWxBvEvhCNLI=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=m+nebqHFsJkhnAwDBEXco8P752NH9R2bFxrf9b+wkx+/tiU6yZwKdDwKOVc2fG1CqZMk7a73J4ULCZiDUdbQNs/Di8EL2wlRtXvKSUCLowunSeClXhf1kLo3dZtcct6SH5f0jxOa5aI67Shn8HCRBLWZAYCldH2B9f0Z8Ns7Il0= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711578598; 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=OChZjnn+2w1PY++x61jMNw7F01q1IVYEVhPPoZ63g5o=; b=WODfZ4khqF6zFgiggw6MF6MGJBAF+95wPDsX4A61BITomI3KefRZbCt5nKWu67J8jCiGVn 3Sd0CqMnu6JmT+iNcj1lLvXkHpdEFpfIpz7g4TRs8URV6YrH1qZd1axaPddWP3qmvEq1Zu tQuOvk5F9QkgyRyVS8Zff3qggG46WD8= 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-515-yESvDg3tNPOiOoXkwzAhmA-1; Wed, 27 Mar 2024 18:29:56 -0400 X-MC-Unique: yESvDg3tNPOiOoXkwzAhmA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (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 40FBE185A781 for ; Wed, 27 Mar 2024 22:29:56 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.22.32.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1B77A492BC8; Wed, 27 Mar 2024 22:29:56 +0000 (UTC) From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [pushed] analyzer: fix ICE due to type mismatch when replaying call summary [PR114473] Date: Wed, 27 Mar 2024 18:29:55 -0400 Message-Id: <20240327222955.1565990-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 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 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-9697-gfdd59818e2abf6. gcc/analyzer/ChangeLog: PR analyzer/114473 * call-summary.cc (call_summary_replay::convert_svalue_from_summary): Assert that the types match. (call_summary_replay::convert_region_from_summary): Likewise. (call_summary_replay::convert_region_from_summary_1): Add missing cast for the deref of RK_SYMBOLIC case. gcc/testsuite/ChangeLog: PR analyzer/114473 * gcc.dg/analyzer/call-summaries-pr114473.c: New test. Signed-off-by: David Malcolm --- gcc/analyzer/call-summary.cc | 12 +++++++ .../gcc.dg/analyzer/call-summaries-pr114473.c | 31 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/analyzer/call-summaries-pr114473.c diff --git a/gcc/analyzer/call-summary.cc b/gcc/analyzer/call-summary.cc index a569bb94cec5..c2c9c71f79b4 100644 --- a/gcc/analyzer/call-summary.cc +++ b/gcc/analyzer/call-summary.cc @@ -235,6 +235,11 @@ call_summary_replay::convert_svalue_from_summary (const svalue *summary_sval) const svalue *caller_sval = convert_svalue_from_summary_1 (summary_sval); + if (caller_sval) + if (summary_sval->get_type () && caller_sval->get_type ()) + gcc_assert (types_compatible_p (summary_sval->get_type (), + caller_sval->get_type ())); + /* Add to cache. */ add_svalue_mapping (summary_sval, caller_sval); @@ -552,6 +557,11 @@ call_summary_replay::convert_region_from_summary (const region *summary_reg) const region *caller_reg = convert_region_from_summary_1 (summary_reg); + if (caller_reg) + if (summary_reg->get_type () && caller_reg->get_type ()) + gcc_assert (types_compatible_p (summary_reg->get_type (), + caller_reg->get_type ())); + /* Add to cache. */ add_region_mapping (summary_reg, caller_reg); @@ -603,6 +613,8 @@ call_summary_replay::convert_region_from_summary_1 (const region *summary_reg) = get_caller_model ()->deref_rvalue (caller_ptr_sval, NULL_TREE, get_ctxt ()); + caller_reg = mgr->get_cast_region (caller_reg, + summary_reg->get_type ()); return caller_reg; } break; diff --git a/gcc/testsuite/gcc.dg/analyzer/call-summaries-pr114473.c b/gcc/testsuite/gcc.dg/analyzer/call-summaries-pr114473.c new file mode 100644 index 000000000000..4598840f0dff --- /dev/null +++ b/gcc/testsuite/gcc.dg/analyzer/call-summaries-pr114473.c @@ -0,0 +1,31 @@ +/* { dg-additional-options "-fanalyzer-call-summaries" } */ + +int a; +extern int *q[]; + +int * +baz (int *src) +{ + while (a) + { + src && a; + return src; + } +} + +void +bar (int **src) +{ + for (unsigned j = 0; j;) + a = 0; + while (a) + baz (src[0]); +} + +void +foo (void) +{ + bar (q); + baz (&a); + bar (q); +}