From patchwork Wed Apr 6 10:23:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 52669 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 02DFC3857C41 for ; Wed, 6 Apr 2022 10:23:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 02DFC3857C41 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1649240620; bh=5Jw8cTBEh1OObksC14uufhkI4ynAzvXpg/h3a4vkQ+8=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=NWsY9esd98EOg+IcmdNZBxh1zNNvSAeqwp09WZq6u/kWW1XeKzcVrOWvCdElqAPDm olP6qw51zxdSBek/I9H9CYRCwBANLHcWmQJnYCEoSZBfKHjyfyF2hJhKVEExCRJMbM AK+kalsKWzEE3IoYE8EZqf5nOd1XKSXfeW0YNHLo= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 4D4773858C54 for ; Wed, 6 Apr 2022 10:23:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4D4773858C54 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-out2.suse.de (Postfix) with ESMTPS id 239971F38A for ; Wed, 6 Apr 2022 10:23:10 +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 0EDD713A8E for ; Wed, 6 Apr 2022 10:23:10 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id XKBdAg5qTWLHIgAAMHmgww (envelope-from ) for ; Wed, 06 Apr 2022 10:23:10 +0000 Date: Wed, 6 Apr 2022 12:23:09 +0200 (CEST) To: gcc-patches@gcc.gnu.org Subject: [PATCH] ipa/105166 - avoid modref queries with mismatching types MIME-Version: 1.0 Message-Id: <20220406102310.0EDD713A8E@imap2.suse-dmz.suse.de> X-Spam-Status: No, score=-11.7 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, 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: 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" We should avoid mismatched argument values (integers for pointers) when doing modref queries. This is the third place to guard. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. 2022-04-06 Richard Biener PR ipa/105166 * ipa-modref-tree.cc (modref_access_node::get_ao_ref ): Bail out for non-pointer arguments. * gcc.dg/torture/pr105166.c: New testcase. --- gcc/ipa-modref-tree.cc | 4 +++- gcc/testsuite/gcc.dg/torture/pr105166.c | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr105166.c diff --git a/gcc/ipa-modref-tree.cc b/gcc/ipa-modref-tree.cc index d0ec2fbf004..f19af8c2b55 100644 --- a/gcc/ipa-modref-tree.cc +++ b/gcc/ipa-modref-tree.cc @@ -678,7 +678,9 @@ modref_access_node::get_ao_ref (const gcall *stmt, ao_ref *ref) const { tree arg; - if (!parm_offset_known || !(arg = get_call_arg (stmt))) + if (!parm_offset_known + || !(arg = get_call_arg (stmt)) + || !POINTER_TYPE_P (TREE_TYPE (arg))) return false; poly_offset_int off = (poly_offset_int)offset + ((poly_offset_int)parm_offset << LOG2_BITS_PER_UNIT); diff --git a/gcc/testsuite/gcc.dg/torture/pr105166.c b/gcc/testsuite/gcc.dg/torture/pr105166.c new file mode 100644 index 00000000000..60e8b73a466 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr105166.c @@ -0,0 +1,9 @@ +/* { dg-do compile } */ + +int bar (foo, a) + int (**foo) (); + int a; +{ + (foo)[1] = bar; + foo[1] (1); +}