diff options
| -rw-r--r-- | clang/lib/Sema/SemaDeclCXX.cpp | 20 | ||||
| -rw-r--r-- | clang/test/CXX/class.derived/p8-0x.cpp | 22 |
2 files changed, 42 insertions, 0 deletions
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index bf5addc34d5..9def74d9543 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -886,6 +886,26 @@ void Sema::CheckOverrideControl(const Decl *D) { << MD->getDeclName(); return; } + + // C++0x [class.derived]p8: + // In a class definition marked with the class-virt-specifier explicit, + // if a virtual member function that is neither implicitly-declared nor a + // destructor overrides a member function of a base class and it is not + // marked with the virt-specifier override, the program is ill-formed. + if (MD->getParent()->isMarkedExplicit() && !isa<CXXDestructorDecl>(MD) && + HasOverriddenMethods && !MD->isMarkedOverride()) { + llvm::SmallVector<const CXXMethodDecl*, 4> + OverriddenMethods(MD->begin_overridden_methods(), + MD->end_overridden_methods()); + + Diag(MD->getLocation(), diag::err_function_overriding_without_override) + << MD->getDeclName() + << (unsigned)OverriddenMethods.size(); + + for (unsigned I = 0; I != OverriddenMethods.size(); ++I) + Diag(OverriddenMethods[I]->getLocation(), + diag::note_overridden_virtual_function); + } } /// CheckIfOverriddenFunctionIsMarkedFinal - Checks whether a virtual member diff --git a/clang/test/CXX/class.derived/p8-0x.cpp b/clang/test/CXX/class.derived/p8-0x.cpp new file mode 100644 index 00000000000..6a667f73ec3 --- /dev/null +++ b/clang/test/CXX/class.derived/p8-0x.cpp @@ -0,0 +1,22 @@ +// RUN: %clang_cc1 %s -fsyntax-only -verify -std=c++0x + +namespace Test1 { + +struct A { + virtual void f(); // expected-note {{overridden virtual function is here}} +}; + +struct B explicit : A { + virtual void f(); // expected-error {{overrides function without being marked 'override'}} +}; + +struct C { + virtual ~C(); +}; + +struct D explicit : C { + virtual ~D(); +}; + +} + |
