From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 343 invoked by alias); 4 Mar 2013 09:59:21 -0000 Received: (qmail 335 invoked by uid 22791); 4 Mar 2013 09:59:20 -0000 X-SWARE-Spam-Status: No, hits=-6.5 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,TW_TM X-Spam-Check-By: sourceware.org Received: from cantor2.suse.de (HELO mx2.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 04 Mar 2013 09:59:12 +0000 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id E6FD4A4E0C; Mon, 4 Mar 2013 10:59:10 +0100 (CET) Date: Mon, 04 Mar 2013 09:59:00 -0000 From: Richard Biener To: Jakub Jelinek Cc: gcc-patches@gcc.gnu.org Subject: Re: [PATCH] Fix leaks in vectorizable_shift (PR middle-end/56461) In-Reply-To: <20130301200527.GC12913@tucnak.redhat.com> Message-ID: References: <20130301200527.GC12913@tucnak.redhat.com> User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org X-SW-Source: 2013-03/txt/msg00096.txt.bz2 On Fri, 1 Mar 2013, Jakub Jelinek wrote: > Hi! > > Except for the case when we set vec_oprnd1 to non-NULL, with j == 0 > we always initialize vec_oprnds[01] with vect_get_vec_defs, which overwrites > the vectors rather than just filling them. So we shouldn't allocate the > vectors first. > > Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk? Ok. Thanks, Richard. > 2013-03-01 Jakub Jelinek > > PR middle-end/56461 > * tree-vect-stmts.c (vectorizable_shift): Don't call create methods > on vec_oprnds0 or vec_oprnds1 before loop, only call it on > vec_oprnds1 right before pushing anything to it for > scalar_shift_arg. > > --- gcc/tree-vect-stmts.c.jj 2013-02-28 22:19:57.000000000 +0100 > +++ gcc/tree-vect-stmts.c 2013-03-01 11:59:03.973792955 +0100 > @@ -3335,21 +3335,6 @@ vectorizable_shift (gimple stmt, gimple_ > /* Handle def. */ > vec_dest = vect_create_destination_var (scalar_dest, vectype); > > - /* Allocate VECs for vector operands. In case of SLP, vector operands are > - created in the previous stages of the recursion, so no allocation is > - needed, except for the case of shift with scalar shift argument. In that > - case we store the scalar operand in VEC_OPRNDS1 for every vector stmt to > - be created to vectorize the SLP group, i.e., SLP_NODE->VEC_STMTS_SIZE. > - In case of loop-based vectorization we allocate VECs of size 1. We > - allocate VEC_OPRNDS1 only in case of binary operation. */ > - if (!slp_node) > - { > - vec_oprnds0.create (1); > - vec_oprnds1.create (1); > - } > - else if (scalar_shift_arg) > - vec_oprnds1.create (slp_node->vec_stmts_size); > - > prev_stmt_info = NULL; > for (j = 0; j < ncopies; j++) > { > @@ -3369,6 +3354,7 @@ vectorizable_shift (gimple stmt, gimple_ > dump_printf_loc (MSG_NOTE, vect_location, > "operand 1 using scalar mode."); > vec_oprnd1 = op1; > + vec_oprnds1.create (slp_node ? slp_node->vec_stmts_size : 1); > vec_oprnds1.quick_push (vec_oprnd1); > if (slp_node) > { > > Jakub > > -- Richard Biener SUSE / SUSE Labs SUSE LINUX Products GmbH - Nuernberg - AG Nuernberg - HRB 16746 GF: Jeff Hawn, Jennifer Guild, Felix Imend