Merge branch 'master' into merge-2.069

This commit is contained in:
Kai Nacke 2016-02-23 06:41:11 +01:00
commit 2d82dae628
3 changed files with 9 additions and 4 deletions

View file

@ -1194,10 +1194,11 @@ public:
// This is a bit more convoluted than it would need to be, because it
// has to take templated interface methods into account, for which
// isFinalFunc is not necessarily true.
// Also, private methods are always not virtual.
// Also, private/package methods are always non-virtual.
const bool nonFinal = !fdecl->isFinalFunc() &&
(fdecl->isAbstract() || fdecl->isVirtual()) &&
fdecl->prot().kind != PROTprivate;
fdecl->prot().kind != PROTprivate &&
fdecl->prot().kind != PROTpackage;
// Get the actual function value to call.
LLValue *funcval = nullptr;