From patchwork Tue Apr 2 21:49:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 1918987 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=b0kmbZtj; 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 4V8M465gwDz1yYw for ; Wed, 3 Apr 2024 08:49:57 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5157D3857C4F for ; Tue, 2 Apr 2024 21:49:55 +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 D37423858D28 for ; Tue, 2 Apr 2024 21:49:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D37423858D28 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 D37423858D28 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=1712094572; cv=none; b=mMY2rOtXUT3E2CS4xAzr5UkB3seDxXDu7bq3fPgeeoELO03vraQNotLx+NLsthgw04qmdq8QdAMgx5tHaw5R/2vULmM5RGkqbnyu3kGIFM0Oxir0FNjdB/TdfTDf+ZafSyo782Xz4h+6Ym0v3Yzr2/GW7et76LKhNSFEkNkoMD0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712094572; c=relaxed/simple; bh=8oDoSMHCSdrG0kqFhGemUOTswdrA7ctVM4aVOB9Yg8o=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=BahSgkq5ncYCCEN+SSE8mFzkrH/bMXGoLEVbUdGxmpO/tf0YC3dly0jPHCiAL/6mOfxn4anF1uEimUxbCwJZsXzy9W0FWmqMURg8qb4XJCxS6ikKiBNLbHrN4SLB5xzO78S1Te/J7BQ7UpOcFgMGT1F87FMmHw27fqd12jnTvhs= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712094570; 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=rtpBVWXshoivWmN/sbRue4xvb/WliDN/N2W1halpYo4=; b=b0kmbZtjhTlaMx0op1QGbx0EvSvV14aGc1zjZDMS4xRgKrID1dOK8k0VsmESYNfRbq3B/Y 9YxfJdh0TQzK6u0T0QnTASo4UguwMPyvV3q4gJ+MGCSVlTgg5sUfZ39F1UTlGqVvhmSIia o1IfwKXk0K/qgkVzE1MXHjFg4cclVXs= 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-442-R9iyLAZ1NwyJW6w-b-Dnkg-1; Tue, 02 Apr 2024 17:49:29 -0400 X-MC-Unique: R9iyLAZ1NwyJW6w-b-Dnkg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 EB47E805A20 for ; Tue, 2 Apr 2024 21:49:28 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.22.10.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id C2843C04221; Tue, 2 Apr 2024 21:49:28 +0000 (UTC) From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [pushed] analyzer: prevent ICEs with null types Date: Tue, 2 Apr 2024 17:49:24 -0400 Message-Id: <20240402214924.2239040-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 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 Fixes some ICEs seen analyzing the Linux kernel. Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu. Pushed to trunk as r14-9762-ge945d322fcbc68. gcc/analyzer/ChangeLog: * region-model-manager.cc (maybe_undo_optimize_bit_field_compare): Guard against null types. * region-model.cc (apply_constraints_for_gswitch): Likewise. Signed-off-by: David Malcolm --- gcc/analyzer/region-model-manager.cc | 2 ++ gcc/analyzer/region-model.cc | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gcc/analyzer/region-model-manager.cc b/gcc/analyzer/region-model-manager.cc index 4feb349c9142..f155eeb87c0d 100644 --- a/gcc/analyzer/region-model-manager.cc +++ b/gcc/analyzer/region-model-manager.cc @@ -616,6 +616,8 @@ maybe_undo_optimize_bit_field_compare (tree type, tree cst, const svalue *arg1) { + if (!type) + return nullptr; if (!INTEGRAL_TYPE_P (type)) return NULL; diff --git a/gcc/analyzer/region-model.cc b/gcc/analyzer/region-model.cc index 902b887fc074..98f287145c6c 100644 --- a/gcc/analyzer/region-model.cc +++ b/gcc/analyzer/region-model.cc @@ -5781,7 +5781,8 @@ apply_constraints_for_gswitch (const switch_cfg_superedge &edge, && is_a (unaryop->get_arg ())) if (const initial_svalue *initvalop = (as_a (unaryop->get_arg ()))) - if (TREE_CODE (initvalop->get_type ()) == ENUMERAL_TYPE) + if (initvalop->get_type () + && TREE_CODE (initvalop->get_type ()) == ENUMERAL_TYPE) { index_sval = initvalop; check_index_type = false;