Merge branch 'master' into merge-2.072

Conflicts:
	runtime/CMakeLists.txt
This commit is contained in:
Martin 2017-02-07 20:20:38 +01:00
commit 03d59b7b96
8 changed files with 301 additions and 195 deletions

View file

@ -78,7 +78,7 @@ void checkStructElems(StructLiteralExp *sle, ArrayParam<Type *> elemTypes) {
}
for (size_t i = 0; i < sle->elements->dim; ++i) {
if ((*sle->elements)[i]->type != elemTypes[i]) {
if ((*sle->elements)[i]->type->toBasetype() != elemTypes[i]) {
sle->error("invalid field type in 'ldc.attributes.%s'; does druntime not "
"match compiler version?",
sle->sd->ident->toChars());