[little merge-fixes wrt. now free-standing functions]

Author: kinke

ir/irclass.cpp

@@ -216,7 +216,7 @@ LLConstant *IrClass::getVtblInit() {
     FuncDeclaration *fd = dsym->isFuncDeclaration();
     assert(fd && "vtbl entry not a function");
 
-    if (cd->isAbstract() || (fd->isAbstract() && !fd->fbody)) {
+    if (isAbstract(cd) || (fd->isAbstract() && !fd->fbody)) {
       c = getNullPtr();
     } else {
       // If inferring return type and semantic3 has not been run, do it now.
@@ -321,14 +321,14 @@ unsigned buildClassinfoFlags(ClassDeclaration *cd) {
       break;
     }
   }
-  if (cd->isAbstract()) {
+  if (isAbstract(cd)) {
     flags |= ClassFlags::isAbstract;
   }
   for (ClassDeclaration *pc = cd; pc; pc = pc->baseClass) {
     if (pc->members) {
       for (Dsymbol *sm : *pc->members) {
         // printf("sm = %s %s\n", sm->kind(), sm->toChars());
-        if (sm->hasPointers()) {
+        if (hasPointers(sm)) {
           return flags;
         }
       }