From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gcc-patches-return-485965-listarch-gcc-patches=gcc.gnu.org@gcc.gnu.org>
Received: (qmail 27914 invoked by alias); 19 Sep 2018 15:10:30 -0000
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
Received: (qmail 27899 invoked by uid 89); 19 Sep 2018 15:10:30 -0000
Authentication-Results: sourceware.org; auth=none
X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=
X-HELO: mx1.redhat.com
Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 19 Sep 2018 15:10:28 +0000
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))	(No client certificate requested)	by mx1.redhat.com (Postfix) with ESMTPS id 67220792BB;	Wed, 19 Sep 2018 15:10:27 +0000 (UTC)
Received: from redhat.com (ovpn-120-207.rdu2.redhat.com [10.10.120.207])	by smtp.corp.redhat.com (Postfix) with ESMTPS id 23B4E60BF7;	Wed, 19 Sep 2018 15:10:25 +0000 (UTC)
Date: Wed, 19 Sep 2018 15:11:00 -0000
From: Marek Polacek <polacek@redhat.com>
To: Andreas Schwab <schwab@suse.de>
Cc: Jason Merrill <jason@redhat.com>, GCC Patches <gcc-patches@gcc.gnu.org>,	Jakub Jelinek <jakub@redhat.com>
Subject: Re: C++ PATCH to implement P1064R0, Virtual Function Calls in Constant Expressions (v4)
Message-ID: <20180919151023.GO5587@redhat.com>
References: <CADzB+2=emyy+pM1GjOTrGV3A6K+Lt5nVW=aKPQXQnNLE8+FjmQ@mail.gmail.com> <20180914204521.GJ5587@redhat.com> <20180917213938.GL5587@redhat.com> <CADzB+2mgVpLQh9p3AXM5m0aB0U1t47WRNpZ7Ys90r24QhHFj7w@mail.gmail.com> <20180918152558.GP16755@redhat.com> <CADzB+2ni0YpayYRgoSYt63_ig4f_Hxsag23_yytm03qG91ejfw@mail.gmail.com> <20180918185534.GR16755@redhat.com> <mvmlg7xvcup.fsf@suse.de> <20180919140518.GN5587@redhat.com> <mvmfty5v83t.fsf@suse.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <mvmfty5v83t.fsf@suse.de>
User-Agent: Mutt/1.10.1 (2018-07-13)
X-SW-Source: 2018-09/txt/msg01068.txt.bz2

On Wed, Sep 19, 2018 at 05:07:34PM +0200, Andreas Schwab wrote:
> On Sep 19 2018, Marek Polacek <polacek@redhat.com> wrote:
> 
> > 2018-09-19  Marek Polacek  <polacek@redhat.com>
> >
> > 	* class.c (build_vtbl_initializer): Don't mess with *inits for
> > 	TARGET_VTABLE_USES_DESCRIPTORS.
> >
> > diff --git gcc/cp/class.c gcc/cp/class.c
> > index 9ca46441871..0239f6ae045 100644
> > --- gcc/cp/class.c
> > +++ gcc/cp/class.c
> > @@ -9370,7 +9370,7 @@ build_vtbl_initializer (tree binfo,
> >  	  int i;
> >  	  if (init == size_zero_node)
> >  	    for (i = 0; i < TARGET_VTABLE_USES_DESCRIPTORS; ++i)
> > -	      CONSTRUCTOR_APPEND_ELT (*inits, idx, init);
> > +	      CONSTRUCTOR_APPEND_ELT (*inits, NULL_TREE, init);
> >  	  else
> >  	    for (i = 0; i < TARGET_VTABLE_USES_DESCRIPTORS; ++i)
> >  	      {
> > @@ -9378,7 +9378,7 @@ build_vtbl_initializer (tree binfo,
> >  				     fn, build_int_cst (NULL_TREE, i));
> >  		TREE_CONSTANT (fdesc) = 1;
> >  
> > -		CONSTRUCTOR_APPEND_ELT (*inits, idx, fdesc);
> > +		CONSTRUCTOR_APPEND_ELT (*inits, NULL_TREE, fdesc);
> >  	      }
> >  	}
> >        else
> 
> Thanks, that works.

Great.  Jason, can I commit it then?

Marek