From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 1BB50386075C for ; Mon, 24 Jul 2023 07:50:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1BB50386075C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de 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 B62AC227DA for ; Mon, 24 Jul 2023 07:50:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1690185021; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=ndYGiZ1j5boDm2nVoIoqZ9dBC85fosiJssFkC5tvmsY=; b=yMKMTsu+lrZJtQ3URpltgQUE/vyPkl1KFk65ihe1rdMj1stnVC3jJcToWVblmRePIkqcdi R2AbI6g8wRC+cZAcPaDqhsqNlhud64ZZqEpV4rHLNmA5gAVtKFFgjL8UDlXu8xpkmfKMnr vXueDDKRcJrEqgJ0f4rezyficdmnSBI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1690185021; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=ndYGiZ1j5boDm2nVoIoqZ9dBC85fosiJssFkC5tvmsY=; b=MguVA9Q61iVFs0vJ0S1qsyP52twGxIBZiddV8nWFfv13tabG8vbUWHUiUHiotFmuGiB16b Kmn43ZtWZ2jNDnCw== 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 A2D6C138E8 for ; Mon, 24 Jul 2023 07:50:21 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id d42eJj0tvmSgbQAAMHmgww (envelope-from ) for ; Mon, 24 Jul 2023 07:50:21 +0000 Date: Mon, 24 Jul 2023 09:50:21 +0200 (CEST) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/110766 - missing PHI location check MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Message-Id: <20230724075021.A2D6C138E8@imap2.suse-dmz.suse.de> X-Spam-Status: No, score=-11.5 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 List-Id: The following adds a missing PHI location check before querying the loop latch PHI arg from it. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. PR tree-optimization/110766 * tree-scalar-evolution.cc (analyze_and_compute_bitwise_induction_effect): Check the PHI is defined in the loop header. * gcc.dg/torture/pr110766.c: New testcase. --- gcc/testsuite/gcc.dg/torture/pr110766.c | 17 +++++++++++++++++ gcc/tree-scalar-evolution.cc | 1 + 2 files changed, 18 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/torture/pr110766.c diff --git a/gcc/testsuite/gcc.dg/torture/pr110766.c b/gcc/testsuite/gcc.dg/torture/pr110766.c new file mode 100644 index 00000000000..97dcacf1e00 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr110766.c @@ -0,0 +1,17 @@ +/* { dg-do compile } */ + +int a, b, c, e; +short d, f; +int g(int h) { return h > a ? h : h << a; } +int main() { + while (e) { + b = 0; + for (; b < 3; b++) + if (c) { + e = g(1); + f = e | d; + } + d = 0; + } + return 0; +} diff --git a/gcc/tree-scalar-evolution.cc b/gcc/tree-scalar-evolution.cc index 2abe8fa0b90..3fb6951e608 100644 --- a/gcc/tree-scalar-evolution.cc +++ b/gcc/tree-scalar-evolution.cc @@ -3519,6 +3519,7 @@ analyze_and_compute_bitwise_induction_effect (class loop* loop, if (!gimple_bitwise_induction_p (phidef, &match_op[0], NULL) || TREE_CODE (match_op[2]) != SSA_NAME || !(header_phi = dyn_cast (SSA_NAME_DEF_STMT (match_op[2]))) + || gimple_bb (header_phi) != loop->header || gimple_phi_num_args (header_phi) != 2) return NULL_TREE; -- 2.35.3