Merge branch 'master' into merge-2.067

This commit is contained in:
Kai Nacke 2015-05-31 19:01:54 +02:00
commit f49d32f5f6
4 changed files with 7 additions and 12 deletions

View file

@ -1716,13 +1716,6 @@ DValue* DtoSymbolAddress(Loc& loc, Type* type, Declaration* decl)
val = DtoArrayLen(gIR->arrays.back());
return new DImValue(type, val);
}
// classinfo
else if (ClassInfoDeclaration* cid = vd->isClassInfoDeclaration())
{
Logger::println("ClassInfoDeclaration: %s", cid->cd->toChars());
DtoResolveClass(cid->cd);
return new DVarValue(type, vd, getIrAggr(cid->cd)->getClassInfoSymbol());
}
// typeinfo
else if (TypeInfoDeclaration* tid = vd->isTypeInfoDeclaration())
{