From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gcc-patches-return-487133-listarch-gcc-patches=gcc.gnu.org@gcc.gnu.org>
Received: (qmail 50483 invoked by alias); 8 Oct 2018 13:36:26 -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 50104 invoked by uid 89); 8 Oct 2018 13:36:25 -0000
Authentication-Results: sourceware.org; auth=none
X-Spam-SWARE-Status: No, score=-11.9 required=5.0 tests=BAYES_00,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS autolearn=ham version=3.3.2 spammy=1748, Virtual, H*f:CADzB
X-HELO: mx1.suse.de
Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 08 Oct 2018 13:36:21 +0000
Received: from relay2.suse.de (unknown [195.135.220.254])	by mx1.suse.de (Postfix) with ESMTP id 66DDCABE3;	Mon,  8 Oct 2018 13:36:19 +0000 (UTC)
From: Andreas Schwab <schwab@suse.de>
To: Jakub Jelinek <jakub@redhat.com>
Cc: Jason Merrill <jason@redhat.com>,  Marek Polacek <polacek@redhat.com>,  GCC Patches <gcc-patches@gcc.gnu.org>
Subject: Re: C++ PATCH to implement P1064R0, Virtual Function Calls in Constant Expressions (v4)
References: <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>	<CADzB+2kLAL-61sBt+jP7GGoJSBLrYHPE6+SGc+DwBzRCU7jrBw@mail.gmail.com>	<mvm36u4vdze.fsf@suse.de> <20180920092059.GE8250@tucnak>
X-Yow: Darling, my ELBOW is FLYING over FRANKFURT, Germany..
Date: Mon, 08 Oct 2018 14:18:00 -0000
In-Reply-To: <20180920092059.GE8250@tucnak> (Jakub Jelinek's message of "Thu,	20 Sep 2018 11:20:59 +0200")
Message-ID: <mvmin2c4l2l.fsf@suse.de>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-SW-Source: 2018-10/txt/msg00437.txt.bz2

On Sep 20 2018, Jakub Jelinek <jakub@redhat.com> wrote:

> --- gcc/cp/class.c.jj	2018-09-20 09:56:59.229751895 +0200
> +++ gcc/cp/class.c	2018-09-20 10:12:17.447370890 +0200
> @@ -9266,7 +9266,6 @@ build_vtbl_initializer (tree binfo,
>        tree vcall_index;
>        tree fn, fn_original;
>        tree init = NULL_TREE;
> -      tree idx = size_int (jx++);
>  
>        fn = BV_FN (v);
>        fn_original = fn;
> @@ -9370,7 +9369,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, size_int (jx++), init);
>  	  else
>  	    for (i = 0; i < TARGET_VTABLE_USES_DESCRIPTORS; ++i)
>  	      {
> @@ -9378,11 +9377,11 @@ 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, size_int (jx++), fdesc);
>  	      }
>  	}
>        else
> -	CONSTRUCTOR_APPEND_ELT (*inits, idx, init);
> +	CONSTRUCTOR_APPEND_ELT (*inits, size_int (jx++), init);
>      }
>  }

This still doesn't fix the tests.

Andreas.

-- 
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."