From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gcc-patches-return-485976-listarch-gcc-patches=gcc.gnu.org@gcc.gnu.org>
Received: (qmail 43404 invoked by alias); 19 Sep 2018 17:25:33 -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 43389 invoked by uid 89); 19 Sep 2018 17:25:33 -0000
Authentication-Results: sourceware.org; auth=none
X-Spam-SWARE-Status: No, score=-25.3 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 spammy=H*r:sk:h26-v6s
X-HELO: mail-ot1-f65.google.com
Received: from mail-ot1-f65.google.com (HELO mail-ot1-f65.google.com) (209.85.210.65) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 19 Sep 2018 17:25:31 +0000
Received: by mail-ot1-f65.google.com with SMTP id h26-v6so6550567otl.9        for <gcc-patches@gcc.gnu.org>; Wed, 19 Sep 2018 10:25:31 -0700 (PDT)
MIME-Version: 1.0
Received: by 2002:ac9:1522:0:0:0:0:0 with HTTP; Wed, 19 Sep 2018 10:25:09 -0700 (PDT)
In-Reply-To: <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> <20180919151023.GO5587@redhat.com>
From: Jason Merrill <jason@redhat.com>
Date: Wed, 19 Sep 2018 17:35:00 -0000
Message-ID: <CADzB+2kLAL-61sBt+jP7GGoJSBLrYHPE6+SGc+DwBzRCU7jrBw@mail.gmail.com>
Subject: Re: C++ PATCH to implement P1064R0, Virtual Function Calls in Constant Expressions (v4)
To: Marek Polacek <polacek@redhat.com>
Cc: Andreas Schwab <schwab@suse.de>, GCC Patches <gcc-patches@gcc.gnu.org>, 	Jakub Jelinek <jakub@redhat.com>
Content-Type: text/plain; charset="UTF-8"
X-IsSubscribed: yes
X-SW-Source: 2018-09/txt/msg01079.txt.bz2

On Wed, Sep 19, 2018 at 11:10 AM, Marek Polacek <polacek@redhat.com> wrote:
> 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?

Andreas, do the new testcases pass?  That would surprise me, but OK if so.

Jason