replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Handle diamond inheritance in -Woverloaded-virtual. 

llvm-svn: 166254
This commit is contained in:
David Blaikie 2012-10-19 00:53:08 +00:00
parent f20544aa52
commit 282c92a708
2 changed files with 69 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
clang/lib/Sema/SemaDeclCXX.cpp
View File

@ -4739,6 +4739,19 @@ namespace {
};
}
/// \brief Check whether any most overriden method from MD in Methods
static bool CheckMostOverridenMethods(const CXXMethodDecl *MD,
const llvm::SmallPtrSet<const CXXMethodDecl *, 8>& Methods) {
if (MD->size_overridden_methods() == 0)
return Methods.count(MD->getCanonicalDecl());
for (CXXMethodDecl::method_iterator I = MD->begin_overridden_methods(),
E = MD->end_overridden_methods();
I != E; ++I)
if (CheckMostOverridenMethods(*I, Methods))
return true;
return false;
}
/// \brief Member lookup function that determines whether a given C++
/// method overloads virtual methods in a base class without overriding any,
/// to be used with CXXRecordDecl::lookupInBases().
@ -4770,12 +4783,7 @@ static bool FindHiddenVirtualMethod(const CXXBaseSpecifier *Specifier,
if (!Data.S->IsOverload(Data.Method, MD, false))
return true;
// Collect the overload only if its hidden.
bool Using = Data.OverridenAndUsingBaseMethods.count(MD);
for (CXXMethodDecl::method_iterator I = MD->begin_overridden_methods(),
E = MD->end_overridden_methods();
I != E && !Using; ++I)
Using = Data.OverridenAndUsingBaseMethods.count(*I);
if (!Using)
if (!CheckMostOverridenMethods(MD, Data.OverridenAndUsingBaseMethods))
overloadedMethods.push_back(MD);
}
}
@ -4786,6 +4794,17 @@ static bool FindHiddenVirtualMethod(const CXXBaseSpecifier *Specifier,
return foundSameNameMethod;
}
/// \brief Add the most overriden methods from MD to Methods
static void AddMostOverridenMethods(const CXXMethodDecl *MD,
llvm::SmallPtrSet<const CXXMethodDecl *, 8>& Methods) {
if (MD->size_overridden_methods() == 0)
Methods.insert(MD->getCanonicalDecl());
for (CXXMethodDecl::method_iterator I = MD->begin_overridden_methods(),
E = MD->end_overridden_methods();
I != E; ++I)
AddMostOverridenMethods(*I, Methods);
}
/// \brief See if a method overloads virtual methods in a base class without
/// overriding any.
void Sema::DiagnoseHiddenVirtualMethods(CXXRecordDecl *DC, CXXMethodDecl *MD) {
@ -4806,14 +4825,11 @@ void Sema::DiagnoseHiddenVirtualMethods(CXXRecordDecl *DC, CXXMethodDecl *MD) {
// by 'using' in a set. A base method not in this set is hidden.
for (DeclContext::lookup_result res = DC->lookup(MD->getDeclName());
res.first != res.second; ++res.first) {
if (CXXMethodDecl *MD = dyn_cast<CXXMethodDecl>(*res.first))
for (CXXMethodDecl::method_iterator I = MD->begin_overridden_methods(),
E = MD->end_overridden_methods();
I != E; ++I)
Data.OverridenAndUsingBaseMethods.insert((*I)->getCanonicalDecl());
NamedDecl *ND = *res.first;
if (UsingShadowDecl *shad = dyn_cast<UsingShadowDecl>(*res.first))
if (CXXMethodDecl *MD = dyn_cast<CXXMethodDecl>(shad->getTargetDecl()))
Data.OverridenAndUsingBaseMethods.insert(MD->getCanonicalDecl());
ND = shad->getTargetDecl();
if (CXXMethodDecl *MD = dyn_cast<CXXMethodDecl>(ND))
AddMostOverridenMethods(MD, Data.OverridenAndUsingBaseMethods);
}
if (DC->lookupInBases(&FindHiddenVirtualMethod, &Data, Paths) &&

40
clang/test/SemaCXX/warn-overloaded-virtual.cpp
View File

@ -80,3 +80,43 @@ struct C: B {
using A::f;
};
}
namespace UnbalancedVirtual {
struct Base {
virtual void func();
};
struct Derived1: virtual Base {
virtual void func();
};
struct Derived2: virtual Base {
};
struct MostDerived: Derived1, Derived2 {
void func(int);
void func();
};
}
namespace UnbalancedVirtual2 {
struct Base {
virtual void func();
};
struct Derived1: virtual Base {
virtual void func();
};
struct Derived2: virtual Base {
};
struct Derived3: Derived1 {
virtual void func();
};
struct MostDerived: Derived3, Derived2 {
void func(int);
void func();
};
}