From patchwork Wed Aug 31 11:03:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 860 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:ecc5:0:0:0:0:0 with SMTP id s5csp173326wro; Wed, 31 Aug 2022 04:04:11 -0700 (PDT) X-Google-Smtp-Source: AA6agR67saFX3fMLA8IJgRAkvZuVRbyW5DAAD0YjnRx9GcF4BCFHwWD9N5JJhKbPebOr0a1iqRwk X-Received: by 2002:a17:907:1627:b0:741:5338:936 with SMTP id hb39-20020a170907162700b0074153380936mr12693818ejc.619.1661943851568; Wed, 31 Aug 2022 04:04:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661943851; cv=none; d=google.com; s=arc-20160816; b=Zv2hLvwWnI1ecmpVgTPXZwVGLY8/7lflq/zWrxa7jVUx+aLRj9FlCBTsbZbdOQ1pKC YEj3r9MREmglV+3SgqfgQDCoYxwpMY8Q0CTksEPW5blhkuBKlrIQh4GnKjqU4nC88aim /L1f9orRGxn0FFJPd6AXzjz8KqGK2P82LiNZHmXrKyCCePp3cfAD5tHcN9WxdkvyWk9Z YT59GWKu/NjH8DcrKGNss20mtHu3iaah9ok0Csl3/vUEHi51xfdikhSuv8ZckDluYxSG bkRGYGYj5Fyvt5Bb15re456IJwsCMsaGI8fQFjQfa3JfpzUzqQOXe8AEhiLIn9xzFpHW gCyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:message-id :mime-version:subject:to:date:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=Yl7MVkztXPZtxH4eilimDeh/VlRKVimmNmt1+Gy0NZI=; b=vrrKUoum2em1GPknmxjploFo5mwWQKyi/ND0tAtm2GXKLyfxg6fGj0tV92uzZIHE5w HUVII4YZM69Oi1k0zbFQZ4n9UUQSYaCkugTlbeNNoZr89hdduKZb/T2y3VXM+K23mkDm P4frVrpI8/326TGeXwZL9YIDPCm2htDortQ4QmYKk19ZUjQ6knjqOYjBeeoOqkddt2HP +24POXp/AfcMn6ZlQNdfKBekP6/fPxGLpSNHaQaAeMywrBXDMmMZF4/cwmKVMQZz/VhX D1Jj1p1VBoMs+ayYJEM7uTJEPE/O3A8RRdM1q62RouBJ6CiGK7QFhJQVwENF4ppzM2KZ WNDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=glhSdBsB; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id s3-20020a17090699c300b007420947aa83si4462984ejn.193.2022.08.31.04.04.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Aug 2022 04:04:11 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=glhSdBsB; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CD34F3858C2D for ; Wed, 31 Aug 2022 11:04:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CD34F3858C2D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1661943844; bh=Yl7MVkztXPZtxH4eilimDeh/VlRKVimmNmt1+Gy0NZI=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=glhSdBsBDiX7R8+RtElKdFa/kDr6VQZG7uaHWD869MMkQBVSp6UfyWnLYIcxLfeqb egGpNvZJQzj7qPlKuuUMsiTRJ0HgaQIc16h5XBuO4QznlIWBRT7bGIgotrF1qiijwP qxFwBgg8wGJsunDoCCnAcoDci+1sn2fH1rXPOZ3s= 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 B3D023858D39 for ; Wed, 31 Aug 2022 11:03:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B3D023858D39 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 7141021E98 for ; Wed, 31 Aug 2022 11:03:19 +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 5A1A013A7C for ; Wed, 31 Aug 2022 11:03:19 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id sD7mFPc/D2O5cgAAMHmgww (envelope-from ) for ; Wed, 31 Aug 2022 11:03:19 +0000 Date: Wed, 31 Aug 2022 13:03:18 +0200 (CEST) To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/65244 - include asserts in predicates for uninit MIME-Version: 1.0 Message-Id: <20220831110319.5A1A013A7C@imap2.suse-dmz.suse.de> 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, T_SCC_BODY_TEXT_LINE 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.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+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1742674436215596615?= X-GMAIL-MSGID: =?utf-8?q?1742674436215596615?= When uninit computes the actual predicates from the control dependence edges it currently skips those that are assert-like (where one edge leads to a block which ends in a noreturn call). That leads to bogus uninit diagnostics when applied on the USE side. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. PR tree-optimization/65244 * gimple-predicate-analysis.h (predicate::init_from_control_deps): Add argument to specify whether the predicate is for the USE. * gimple-predicate-analysis.cc (predicate::init_from_control_deps): Also include predicates effective fallthru control edges when the predicate is for the USE. * gcc.dg/uninit-pr65244-2.c: New testcase. --- gcc/gimple-predicate-analysis.cc | 17 +++++++++++------ gcc/gimple-predicate-analysis.h | 2 +- gcc/testsuite/gcc.dg/uninit-pr65244-2.c | 20 ++++++++++++++++++++ 3 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/uninit-pr65244-2.c diff --git a/gcc/gimple-predicate-analysis.cc b/gcc/gimple-predicate-analysis.cc index 6b2e347536a..49500b77832 100644 --- a/gcc/gimple-predicate-analysis.cc +++ b/gcc/gimple-predicate-analysis.cc @@ -1666,7 +1666,7 @@ predicate::normalize (gimple *use_or_def, bool is_use) void predicate::init_from_control_deps (const vec *dep_chains, - unsigned num_chains) + unsigned num_chains, bool is_use) { gcc_assert (is_empty ()); @@ -1675,7 +1675,8 @@ predicate::init_from_control_deps (const vec *dep_chains, return; if (DEBUG_PREDICATE_ANALYZER && dump_file) - fprintf (dump_file, "init_from_control_deps {%s}:\n", + fprintf (dump_file, "init_from_control_deps [%s] {%s}:\n", + is_use ? "USE" : "DEF", format_edge_vecs (dep_chains, num_chains).c_str ()); /* Convert the control dependency chain into a set of predicates. */ @@ -1711,8 +1712,12 @@ predicate::init_from_control_deps (const vec *dep_chains, if (is_gimple_call (cond_stmt) && EDGE_COUNT (e->src->succs) >= 2) /* Ignore EH edge. Can add assertion on the other edge's flag. */ continue; - /* Skip if there is essentially one succesor. */ - if (EDGE_COUNT (e->src->succs) == 2) + /* Skip this edge if it is bypassing an abort - when the + condition is not satisfied we are neither reaching the + definition nor the use so it isn't meaningful. Note if + we are processing the use predicate the condition is + meaningful. See PR65244. */ + if (!is_use && EDGE_COUNT (e->src->succs) == 2) { edge e1; edge_iterator ei1; @@ -1941,7 +1946,7 @@ uninit_analysis::init_use_preds (predicate &use_preds, basic_block def_bb, condition under which the definition in DEF_BB is used in USE_BB. Each OR subexpression is represented by one element of DEP_CHAINS, where each element consists of a series of AND subexpressions. */ - use_preds.init_from_control_deps (dep_chains, num_chains); + use_preds.init_from_control_deps (dep_chains, num_chains, true); return !use_preds.is_empty (); } @@ -2050,7 +2055,7 @@ uninit_analysis::init_from_phi_def (gphi *phi) /* Convert control dependence chains to the predicate in *THIS under which the PHI operands are defined to values for which M_EVAL is false. */ - m_phi_def_preds.init_from_control_deps (dep_chains, num_chains); + m_phi_def_preds.init_from_control_deps (dep_chains, num_chains, false); return !m_phi_def_preds.is_empty (); } diff --git a/gcc/gimple-predicate-analysis.h b/gcc/gimple-predicate-analysis.h index 48da8f70efd..bc0248d7a93 100644 --- a/gcc/gimple-predicate-analysis.h +++ b/gcc/gimple-predicate-analysis.h @@ -65,7 +65,7 @@ class predicate return m_preds; } - void init_from_control_deps (const vec *, unsigned); + void init_from_control_deps (const vec *, unsigned, bool); void dump (gimple *, const char *) const; diff --git a/gcc/testsuite/gcc.dg/uninit-pr65244-2.c b/gcc/testsuite/gcc.dg/uninit-pr65244-2.c new file mode 100644 index 00000000000..a28893cdcb5 --- /dev/null +++ b/gcc/testsuite/gcc.dg/uninit-pr65244-2.c @@ -0,0 +1,20 @@ +/* { dg-do compile } */ +/* { dg-options "-Og -Wuninitialized -ftree-bit-ccp -fno-thread-jumps -fdump-tree-uninit2" } */ + +void exit(int __status) __attribute__ ((__noreturn__)); +int posix_memalign(void **__memptr, __SIZE_TYPE__ __alignment, + __SIZE_TYPE__ __size); + +void *f(void) +{ + void *ptr; + + if (posix_memalign(&ptr, 16, 256) != 0) + exit(1); + + return ptr; /* { dg-bogus "uninitialized" } */ +} + +/* Make sure the uninit pass has something to do, add to the set of + disabled optimizations if not. */ +/* { dg-final { scan-tree-dump "# ptr_. = PHI" "uninit2" } } */