From patchwork Tue Jan 18 13:32:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 50160 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 D3C753858D39 for ; Tue, 18 Jan 2022 13:34:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D3C753858D39 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1642512881; bh=VONBzNt8Iw+nzQ72bviQ1XcDa2QyyP/TaiYhbdTpsWs=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=mDX7nEmZKKloBv0qC+t3gvZjq8fUrPTh69kWVX5iGup7w/jP1M+XTDM9q4xS8F2i5 xjxsXP2IquWW49dF3f/b0S2gkgV3vR4YOApOAd9wXPaxhDvenXF+/IjLxS7mUeCes5 tljqHaNjCp9q2tGM8Ti1hvFg648yIhU6GYt8b0vk= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id CEF593857C63 for ; Tue, 18 Jan 2022 13:32:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CEF593857C63 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 95D4B218A9 for ; Tue, 18 Jan 2022 13:32:54 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 83A9C13AA1 for ; Tue, 18 Jan 2022 13:32:54 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id KpsYH4bB5mGaGAAAMHmgww (envelope-from ) for ; Tue, 18 Jan 2022 13:32:54 +0000 Date: Tue, 18 Jan 2022 14:32:54 +0100 (CET) To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/103987 - guard DSE modref query Message-ID: <7o2648r6-ss51-88pr-ppss-r57p835533rr@fhfr.qr> MIME-Version: 1.0 X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP 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: Richard Biener via Gcc-patches From: Richard Biener Reply-To: Richard Biener Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" This adds a missing guard for a pointer to the DSE modref query, otherwise we can end up invoking APIs desired to only work on pointers on non-pointers when there are mismatches between declared and actual arguments of functions in the program. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. 2022-01-18 Richard Biener PR tree-optimization/103987 * tree-ssa-dse.cc (dse_optimize_call): Properly guard modref query with a pointer check. * gcc.dg/torture/pr103987.c: New testcase. --- gcc/testsuite/gcc.dg/torture/pr103987.c | 13 +++++++++++++ gcc/tree-ssa-dse.cc | 7 +++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr103987.c diff --git a/gcc/testsuite/gcc.dg/torture/pr103987.c b/gcc/testsuite/gcc.dg/torture/pr103987.c new file mode 100644 index 00000000000..6bfc76881a1 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr103987.c @@ -0,0 +1,13 @@ +/* { dg-do compile } */ + +void foo(); + +void bar(int i) +{ + foo (i); +} + +void foo(int *p) +{ + *p = 0; +} diff --git a/gcc/tree-ssa-dse.cc b/gcc/tree-ssa-dse.cc index ed73bee932a..47997df2125 100644 --- a/gcc/tree-ssa-dse.cc +++ b/gcc/tree-ssa-dse.cc @@ -43,6 +43,7 @@ along with GCC; see the file COPYING3. If not see #include "cgraph.h" #include "ipa-modref-tree.h" #include "ipa-modref.h" +#include "target.h" /* This file implements dead store elimination. @@ -1190,10 +1191,12 @@ dse_optimize_call (gimple_stmt_iterator *gsi, sbitmap live_bytes) { tree arg = access_node.get_call_arg (stmt); - if (!arg) + if (!arg || !POINTER_TYPE_P (TREE_TYPE (arg))) return false; - if (integer_zerop (arg) && flag_delete_null_pointer_checks) + if (integer_zerop (arg) + && !targetm.addr_space.zero_address_valid + (TYPE_ADDR_SPACE (TREE_TYPE (arg)))) continue; ao_ref ref;