From 054d78934a60b6270cc800fa5dcc3e4ba0e103bd Mon Sep 17 00:00:00 2001 From: Kai Nacke Date: Fri, 1 Nov 2013 17:55:34 +0100 Subject: [PATCH] Update to b52c07. Also includes latest druntime changes. --- dmd2/expression.c | 8 ++++++-- runtime/druntime | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dmd2/expression.c b/dmd2/expression.c index 5a32fe83..de9d1169 100644 --- a/dmd2/expression.c +++ b/dmd2/expression.c @@ -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(); diff --git a/runtime/druntime b/runtime/druntime index cb3f03ff..9ffca792 160000 --- a/runtime/druntime +++ b/runtime/druntime @@ -1 +1 @@ -Subproject commit cb3f03ff279548f109e69887cd480e2ff62163f9 +Subproject commit 9ffca792ac1df0322714f4ba42288e5a18575a55