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

Fixed problem with static ctors, in templated imported classes, not begin run. Fixes #203

Browse source
This commit is contained in:
Tomas Lindquist Olsen 2009-02-04 00:50:04 +01:00
parent bd4f7ec731
commit 584911ad4e
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gen/functions.cpp
View file

@ -546,13 +546,17 @@ void DtoDeclareFunction(FuncDeclaration* fdecl)
} }
// static ctor // static ctor
if (fdecl->isStaticCtorDeclaration() && fdecl->getModule() == gIR->dmodule) { if (fdecl->isStaticCtorDeclaration()) {
if (fdecl->getModule() == gIR->dmodule || fdecl->inTemplateInstance()) {
gIR->ctors.push_back(fdecl); gIR->ctors.push_back(fdecl);
} }
}
// static dtor // static dtor
else if (fdecl->isStaticDtorDeclaration() && fdecl->getModule() == gIR->dmodule) { else if (fdecl->isStaticDtorDeclaration()) {
if (fdecl->getModule() == gIR->dmodule || fdecl->inTemplateInstance()) {
gIR->dtors.push_back(fdecl); gIR->dtors.push_back(fdecl);
} }
}
// we never reference parameters of function prototypes // we never reference parameters of function prototypes
std::string str; std::string str;

1
gen/llvmhelpers.cpp
View file

@ -826,6 +826,7 @@ DValue* DtoPaintType(Loc& loc, DValue* val, Type* to)
// TEMPLATE HELPERS // TEMPLATE HELPERS
////////////////////////////////////////////////////////////////////////////////////////*/ ////////////////////////////////////////////////////////////////////////////////////////*/
// FIXME: when is this the right one to use instead of Dsymbol::inTemplateInstance() ?
bool DtoIsTemplateInstance(Dsymbol* s) bool DtoIsTemplateInstance(Dsymbol* s)
{ {
if (!s) return false; if (!s) return false;