From patchwork Wed Mar 23 12:40:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 1608596 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=qriG/D9E; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from 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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KNnyX0grNz9s0r for ; Wed, 23 Mar 2022 23:40:50 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6ED433888816 for ; Wed, 23 Mar 2022 12:40:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6ED433888816 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1648039248; bh=oGet2Ja+JQCHoFJX9mmFpM8HVPx+wKT5smY107pLj9I=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=qriG/D9EWIvf79V2DgL2FHsR+xHKYuiM7XaOsfmyNFKzak/cY7eq1zUYRuTW/UI03 YRM39tketNav76oWkp9zPI46EqoJoniG6VPQvkhsEwB40yzb15BHHj/ekkDmNhefvp H6Ko9bg9x6dr9oOSITqe0Sq+d+i2N7b1WnjTiBkc= 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 785A53858405 for ; Wed, 23 Mar 2022 12:40:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 785A53858405 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-384-40XqKinbOcOyqIonzlzxnw-1; Wed, 23 Mar 2022 08:40:22 -0400 X-MC-Unique: 40XqKinbOcOyqIonzlzxnw-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4C3C61C168E2 for ; Wed, 23 Mar 2022 12:40:22 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.2.17.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id E27FC56D18B; Wed, 23 Mar 2022 12:40:21 +0000 (UTC) To: gcc-patches@gcc.gnu.org Subject: [committed] analyzer: fix ICE adding note to disabled diagnostic [PR104997] Date: Wed, 23 Mar 2022 08:40:20 -0400 Message-Id: <20220323124020.523126-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.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_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: David Malcolm via Gcc-patches From: David Malcolm Reply-To: David Malcolm Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu. Pushed to trunk as r12-7782-g160b095fc9ded4. gcc/analyzer/ChangeLog: PR analyzer/104997 * diagnostic-manager.cc (diagnostic_manager::add_diagnostic): Convert return type from "void" to "bool", reporting success vs failure to caller, for both overloads. * diagnostic-manager.h (diagnostic_manager::add_diagnostic): Likewise. * engine.cc (impl_region_model_context::warn): Propagate return value from diagnostic_manager::add_diagnostic. gcc/testsuite/ChangeLog: PR analyzer/104997 * gcc.dg/analyzer/write-to-string-literal-4-disabled.c: New test, adapted from write-to-string-literal-4.c. Signed-off-by: David Malcolm --- gcc/analyzer/diagnostic-manager.cc | 18 ++++++++---- gcc/analyzer/diagnostic-manager.h | 4 +-- gcc/analyzer/engine.cc | 9 ++---- .../write-to-string-literal-4-disabled.c | 28 +++++++++++++++++++ 4 files changed, 45 insertions(+), 14 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/analyzer/write-to-string-literal-4-disabled.c diff --git a/gcc/analyzer/diagnostic-manager.cc b/gcc/analyzer/diagnostic-manager.cc index d5e5b6926cc..bf7c8fc5147 100644 --- a/gcc/analyzer/diagnostic-manager.cc +++ b/gcc/analyzer/diagnostic-manager.cc @@ -874,9 +874,11 @@ diagnostic_manager::diagnostic_manager (logger *logger, engine *eng, { } -/* Queue pending_diagnostic D at ENODE for later emission. */ +/* Queue pending_diagnostic D at ENODE for later emission. + Return true/false signifying if the diagnostic was actually added. + Take ownership of D (or delete it). */ -void +bool diagnostic_manager::add_diagnostic (const state_machine *sm, exploded_node *enode, const supernode *snode, const gimple *stmt, @@ -907,7 +909,7 @@ diagnostic_manager::add_diagnostic (const state_machine *sm, d->get_kind ()); delete d; m_num_disabled_diagnostics++; - return; + return false; } } @@ -920,18 +922,22 @@ diagnostic_manager::add_diagnostic (const state_machine *sm, log ("adding saved diagnostic %i at SN %i to EN %i: %qs", sd->get_index (), snode->m_index, enode->m_index, d->get_kind ()); + return true; } -/* Queue pending_diagnostic D at ENODE for later emission. */ +/* Queue pending_diagnostic D at ENODE for later emission. + Return true/false signifying if the diagnostic was actually added. + Take ownership of D (or delete it). */ -void +bool diagnostic_manager::add_diagnostic (exploded_node *enode, const supernode *snode, const gimple *stmt, stmt_finder *finder, pending_diagnostic *d) { gcc_assert (enode); - add_diagnostic (NULL, enode, snode, stmt, finder, NULL_TREE, NULL, 0, d); + return add_diagnostic (NULL, enode, snode, stmt, finder, NULL_TREE, + NULL, 0, d); } /* Add PN to the most recent saved_diagnostic. */ diff --git a/gcc/analyzer/diagnostic-manager.h b/gcc/analyzer/diagnostic-manager.h index 34abf56d11f..fc5dc043c78 100644 --- a/gcc/analyzer/diagnostic-manager.h +++ b/gcc/analyzer/diagnostic-manager.h @@ -107,7 +107,7 @@ public: json::object *to_json () const; - void add_diagnostic (const state_machine *sm, + bool add_diagnostic (const state_machine *sm, exploded_node *enode, const supernode *snode, const gimple *stmt, stmt_finder *finder, @@ -116,7 +116,7 @@ public: state_machine::state_t state, pending_diagnostic *d); - void add_diagnostic (exploded_node *enode, + bool add_diagnostic (exploded_node *enode, const supernode *snode, const gimple *stmt, stmt_finder *finder, pending_diagnostic *d); diff --git a/gcc/analyzer/engine.cc b/gcc/analyzer/engine.cc index f911ed4ac39..caa8796b494 100644 --- a/gcc/analyzer/engine.cc +++ b/gcc/analyzer/engine.cc @@ -129,12 +129,9 @@ impl_region_model_context::warn (pending_diagnostic *d) return false; } if (m_eg) - { - m_eg->get_diagnostic_manager ().add_diagnostic - (m_enode_for_diag, m_enode_for_diag->get_supernode (), - m_stmt, m_stmt_finder, d); - return true; - } + return m_eg->get_diagnostic_manager ().add_diagnostic + (m_enode_for_diag, m_enode_for_diag->get_supernode (), + m_stmt, m_stmt_finder, d); else { delete d; diff --git a/gcc/testsuite/gcc.dg/analyzer/write-to-string-literal-4-disabled.c b/gcc/testsuite/gcc.dg/analyzer/write-to-string-literal-4-disabled.c new file mode 100644 index 00000000000..fa21af13341 --- /dev/null +++ b/gcc/testsuite/gcc.dg/analyzer/write-to-string-literal-4-disabled.c @@ -0,0 +1,28 @@ +/* Verify that we can disable warnings that have notes added to them via + region_model_context_decorator::add_note. */ + +/* { dg-additional-options "-Wno-analyzer-write-to-string-literal" } */ + +typedef __SIZE_TYPE__ size_t; + +int getrandom (void *__buffer, size_t __length, /* { dg-bogus "parameter 1 of 'getrandom' marked with attribute 'access \\(write_only, 1, 2\\)'" } */ + unsigned int __flags) + __attribute__ ((access (__write_only__, 1, 2))); + +#define GRND_RANDOM 0x02 + +void test (int flag) +{ + char *buf; + + if (flag) + buf = __builtin_malloc (1024); + else + buf = (char *)""; /* { dg-bogus "here" } */ + + if (getrandom(buf, 16, GRND_RANDOM)) /* { dg-bogus "write to string literal" } */ + __builtin_printf("%s\n", buf); + + if (flag) + __builtin_free (buf); +}