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

merge

Browse source
This commit is contained in:
Tomas Lindquist Olsen 2008-11-29 18:28:32 +01:00
commit 3a2e29d434
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gen/classes.cpp
View file

@ -547,7 +547,7 @@ static void init_class_vtbl_initializer(ClassDeclaration* cd)
FuncDeclaration* fd = dsym->isFuncDeclaration(); FuncDeclaration* fd = dsym->isFuncDeclaration();
assert(fd); assert(fd);
if (fd->isAbstract()) if (fd->isAbstract() || (cd->isAbstract() && !fd->fbody))
{ {
sinits[k] = getNullPtr(getVoidPtrType()); sinits[k] = getNullPtr(getVoidPtrType());
} }

2
gen/llvmhelpers.cpp
View file

@ -972,7 +972,7 @@ void DtoConstInitGlobal(VarDeclaration* vd)
// FIXME: I don't think it's thread safe ... // FIXME: I don't think it's thread safe ...
bool doLazyInit = false; bool doLazyInit = false;
Dsymbol* par = vd->toParent2(); Dsymbol* par = vd->toParent();
if (par && par->isFuncDeclaration() && vd->init) if (par && par->isFuncDeclaration() && vd->init)
{ {