D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-23 16:23:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not emit declare or emit a vtbl entry for bodyless functions in abstract classes.

Browse Source 
Maybe the better fix would be to adjust FuncDeclaration::isAbstract, but there
may be unwelcome sideeffects.
This commit is contained in:
Christian Kamm
2009-04-19 00:06:23 +02:00
parent 134870c873
commit 522c580647
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gen/functions.cpp
View File

@@ -361,8 +361,11 @@ void DtoResolveFunction(FuncDeclaration* fdecl)
Logger::println("DtoResolveFunction(%s): %s", fdecl->toPrettyChars(), fdecl->loc.toChars());
LOG_SCOPE;
// queue declaration unless the function is abstract without body
if (!fdecl->isAbstract() || fdecl->fbody)
// queue declaration unless the function is abstract without body;
// bodyless functions in an abstract class are considered abstract
ClassDeclaration* cd = fdecl->parent->isClassDeclaration();
bool isabstract = fdecl->isAbstract() || (cd && cd->isAbstract());
if (!isabstract || fdecl->fbody)
{
DtoDeclareFunction(fdecl);
}

4
ir/irclass.cpp
View File

@@ -132,7 +132,7 @@ LLConstant * IrStruct::getVtblInit()
FuncDeclaration* fd = dsym->isFuncDeclaration();
assert(fd && "vtbl entry not a function");
if (fd->isAbstract() && !fd->fbody)
if ((cd->isAbstract() || fd->isAbstract()) && !fd->fbody)
{
c = getNullValue(DtoType(fd->type->pointerTo()));
}
@@ -335,7 +335,7 @@ llvm::GlobalVariable * IrStruct::getInterfaceVtbl(BaseClass * b, bool new_instan
FuncDeclaration* fd = dsym->isFuncDeclaration();
assert(fd && "vtbl entry not a function");
assert(!(fd->isAbstract() && !fd->fbody) &&
assert(!((fd->isAbstract() || cd->isAbstract()) && !fd->fbody) &&
"null symbol in interface implementation vtable");
fd->codegen(Type::sir);