Update to b52c07.

Also includes latest druntime changes.
This commit is contained in:
Kai Nacke
2013-11-01 17:55:34 +01:00
parent d48c72d435
commit 054d78934a
2 changed files with 7 additions and 3 deletions

View File

@@ -1323,6 +1323,10 @@ bool Expression::checkPostblit(Scope *sc, Type *t)
t = t->baseElemOf();
if (t->ty == Tstruct)
{
// Bugzilla 11395: Require TypeInfo generation for array concatenation
if (!t->vtinfo)
t->getTypeInfo(sc);
StructDeclaration *sd = ((TypeStruct *)t)->sym;
if (sd->postblit)
{
@@ -12608,9 +12612,9 @@ Expression *CatExp::semantic(Scope *sc)
{
type = type->nextOf()->toHeadMutable()->arrayOf();
}
if (tb->nextOf())
if (Type *tbn = tb->nextOf())
{
checkPostblit(sc, tb->nextOf());
checkPostblit(sc, tbn);
}
#if 0
e1->type->print();