mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-04 00:55:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into merge-2.067

Browse source
This commit is contained in:
David Nadlinger 2015-07-11 18:10:43 +02:00
commit 21d1bab114
6 changed files with 138 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gen/llvmhelpers.cpp
View file

@ -943,7 +943,11 @@ void DtoResolveVariable(VarDeclaration* vd)
Logger::println("parent: null");
}
const bool isLLConst = (vd->isConst() || vd->isImmutable()) && vd->init;
// If a const/immutable value has a proper initializer (not "= void"),
// it cannot be assigned again in a static constructor. Thus, we can
// emit it as read-only data.
const bool isLLConst = (vd->isConst() || vd->isImmutable()) &&
vd->init && !vd->init->isVoidInitializer();
assert(!vd->ir.isInitialized());
if (gIR->dmodule)