mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-02-25 16:25:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR c++/56291 (ICE for C++11 in output_constructor_regular_field, at varasm.c:4821)

Browse Source 
PR c++/56291
	* semantics.c (sort_constexpr_mem_initializers): Handle
	vptr out of order.

From-SVN: r195986
This commit is contained in:
Jason Merrill 2013-02-12 12:36:58 -05:00 committed by Jason Merrill
parent bf94424ce1
commit 1f8aec0030
3 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2013-02-12 Jason Merrill <jason@redhat.com>
PR c++/56291
* semantics.c (sort_constexpr_mem_initializers): Handle
vptr out of order.
2013-02-09 Jason Merrill <jason@redhat.com>
PR c++/56268

32
gcc/cp/semantics.c
View File

@ -5948,31 +5948,39 @@ check_constexpr_ctor_body (tree last, tree list)
/* V is a vector of constructor elements built up for the base and member
initializers of a constructor for TYPE. They need to be in increasing
offset order, which they might not be yet if TYPE has a primary base
which is not first in the base-clause. */
which is not first in the base-clause or a vptr and at least one base
all of which are non-primary. */
static vec<constructor_elt, va_gc> *
sort_constexpr_mem_initializers (tree type, vec<constructor_elt, va_gc> *v)
{
tree pri = CLASSTYPE_PRIMARY_BINFO (type);
tree field_type;
constructor_elt elt;
int i;
if (pri == NULL_TREE
|| pri == BINFO_BASE_BINFO (TYPE_BINFO (type), 0))
if (pri)
field_type = BINFO_TYPE (pri);
else if (TYPE_CONTAINS_VPTR_P (type))
field_type = vtbl_ptr_type_node;
else
return v;
/* Find the element for the primary base and move it to the beginning of
the vec. */
/* Find the element for the primary base or vptr and move it to the
beginning of the vec. */
vec<constructor_elt, va_gc> &vref = *v;
pri = BINFO_TYPE (pri);
for (i = 1; ; ++i)
if (TREE_TYPE (vref[i].index) == pri)
for (i = 0; ; ++i)
if (TREE_TYPE (vref[i].index) == field_type)
break;
elt = vref[i];
for (; i > 0; --i)
vref[i] = vref[i-1];
vref[0] = elt;
if (i > 0)
{
elt = vref[i];
for (; i > 0; --i)
vref[i] = vref[i-1];
vref[0] = elt;
}
return v;
}

18
gcc/testsuite/g++.dg/cpp0x/constexpr-virtual4.C Normal file
View File

@ -0,0 +1,18 @@
// PR c++/56291
// { dg-options -std=c++11 }
class Base
{
public:
constexpr Base() : v(1) {};
int v;
};
class Derived : public Base
{
public:
constexpr Derived() : Base() {};
virtual void function();
};
Derived d;