D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-02-11 17:33:13 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Increment vgates in static constructors. That fixes static destructors of templates.

Browse Source
This commit is contained in:
Alexey Prokhin
2011-01-02 17:43:02 +03:00
parent a86f414bc1
commit 8a49067776
4 changed files with 39 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gen/functions.cpp
View File

@@ -509,9 +509,11 @@ void DtoDeclareFunction(FuncDeclaration* fdecl)
}
}
// shared static dtor
else if (fdecl->isSharedStaticDtorDeclaration()) {
else if (StaticDtorDeclaration *dtorDecl = fdecl->isSharedStaticDtorDeclaration()) {
if (mustDefineSymbol(fdecl)) {
gIR->sharedDtors.push_front(fdecl);
if (dtorDecl->vgate)
gIR->sharedGates.push_front(dtorDecl->vgate);
}
} else
#endif
@@ -522,9 +524,13 @@ void DtoDeclareFunction(FuncDeclaration* fdecl)
}
}
// static dtor
else if (fdecl->isStaticDtorDeclaration()) {
else if (StaticDtorDeclaration *dtorDecl = fdecl->isStaticDtorDeclaration()) {
if (mustDefineSymbol(fdecl)) {
gIR->dtors.insert(gIR->dtors.begin(), fdecl);
gIR->dtors.push_front(fdecl);
#if DMDV2
if (dtorDecl->vgate)
gIR->gates.push_front(dtorDecl->vgate);
#endif
}
}