Merge branch 'master' into merge-2.064

This commit is contained in:
Kai Nacke 2013-11-14 21:35:10 +01:00
commit b22b7aef3c

View file

@ -1063,7 +1063,7 @@ void DtoResolveVariable(VarDeclaration* vd)
Logger::println("parent: null");
}
const bool isLLConst = vd->isConst() && vd->init;
const bool isLLConst = (vd->isConst() || vd->isImmutable()) && vd->init;
assert(!vd->ir.initialized);
vd->ir.initialized = gIR->dmodule;