Mercurial > projects > ldc
changeset 1250:4b0b470bb2f9
Automated merge with http://hg.dsource.org/projects/ldc
| author | Christian Kamm <kamm incasoftware de> |
|---|---|
| date | Tue, 21 Apr 2009 18:57:29 +0200 |
| parents | 01909bd1132c (current diff) 871ae029ff49 (diff) |
| children | 0c8048e13867 |
| files | gen/functions.cpp |
| diffstat | 2 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/gen/functions.cpp Tue Apr 21 17:54:43 2009 +0200 +++ b/gen/functions.cpp Tue Apr 21 18:57:29 2009 +0200 @@ -386,8 +386,11 @@ 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); }
--- a/ir/irclass.cpp Tue Apr 21 17:54:43 2009 +0200 +++ b/ir/irclass.cpp Tue Apr 21 18:57:29 2009 +0200 @@ -132,7 +132,7 @@ 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 @@ 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);