# HG changeset patch
# User Christian Kamm <kamm incasoftware de>
# Date 1240092383 -7200
# Node ID 871ae029ff49c3dddafa65a15d6b4e4d185b65e5
# Parent  2a92c115461d7ca04ea51d2a734c683ed97f606d
Do not emit declare or emit a vtbl entry for bodyless functions in abstract classes.

Maybe the better fix would be to adjust FuncDeclaration::isAbstract, but there
may be unwelcome sideeffects.

diff -r 2a92c115461d -r 871ae029ff49 gen/functions.cpp
--- a/gen/functions.cpp	Fri Apr 17 17:16:55 2009 +0200
+++ b/gen/functions.cpp	Sun Apr 19 00:06:23 2009 +0200
@@ -361,8 +361,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);
     }
diff -r 2a92c115461d -r 871ae029ff49 ir/irclass.cpp
--- a/ir/irclass.cpp	Fri Apr 17 17:16:55 2009 +0200
+++ b/ir/irclass.cpp	Sun Apr 19 00:06:23 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);