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 BC8B3385BAE6 for ; Mon, 11 Jul 2022 10:08:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BC8B3385BAE6 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 A58F022827 for ; Mon, 11 Jul 2022 10:08:35 +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 937D713524 for ; Mon, 11 Jul 2022 10:08:35 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id JfTpIqP2y2KoUQAAMHmgww (envelope-from ) for ; Mon, 11 Jul 2022 10:08:35 +0000 Date: Mon, 11 Jul 2022 12:08:35 +0200 (CEST) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/106228 - fixup last change MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Message-Id: <20220711100835.937D713524@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-List-Received-Date: Mon, 11 Jul 2022 10:08:38 -0000 The following fixes the last commit to honor the case we are not vectorizing a loop. Bootstrapped on x86_64-unknown-linux-gnu, pushed. PR tree-optimization/106228 * tree-vect-data-refs.cc (vect_setup_realignment): Adjust VUSE compute for the non-loop case. --- gcc/tree-vect-data-refs.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gcc/tree-vect-data-refs.cc b/gcc/tree-vect-data-refs.cc index 53e52cb58cb..609cacc4971 100644 --- a/gcc/tree-vect-data-refs.cc +++ b/gcc/tree-vect-data-refs.cc @@ -5777,14 +5777,14 @@ vect_setup_realignment (vec_info *vinfo, stmt_vec_info stmt_info, if (at_loop) *at_loop = loop_for_initial_load; + tree vuse = NULL_TREE; if (loop_for_initial_load) - pe = loop_preheader_edge (loop_for_initial_load); - - tree vuse; - gphi *vphi = get_virtual_phi (loop_for_initial_load->header); - if (vphi) - vuse = PHI_ARG_DEF_FROM_EDGE (vphi, pe); - else + { + pe = loop_preheader_edge (loop_for_initial_load); + if (gphi *vphi = get_virtual_phi (loop_for_initial_load->header)) + vuse = PHI_ARG_DEF_FROM_EDGE (vphi, pe); + } + if (!vuse) vuse = gimple_vuse (gsi_stmt (*gsi)); /* 3. For the case of the optimized realignment, create the first vector -- 2.35.3