def err_final_base : Error<
"derivation from 'final' %0">;
+// C++0x [[override]]
+def err_override_function_not_overriding : Error<
+ "%0 marked 'override' but does not override any member functions">;
+
// C++0x scoped enumerations
def err_enum_invalid_underlying : Error<
"non-integral type %0 is an invalid underlying type">;
}
}
+/// CheckClassMemberNameAttributes - Check for class member name checking
+/// attributes according to [dcl.attr.override]
+static void
+CheckClassMemberNameAttributes(Sema& SemaRef, const FunctionDecl *FD) {
+ const CXXMethodDecl *MD = dyn_cast<CXXMethodDecl>(FD);
+ if (!MD || !MD->isVirtual())
+ return;
+
+ bool HasOverrideAttr = MD->hasAttr<OverrideAttr>();
+ bool HasOverriddenMethods =
+ MD->begin_overridden_methods() != MD->end_overridden_methods();
+
+ /// C++ [dcl.attr.override]p2:
+ /// If a virtual member function f is marked override and does not override
+ /// a member function of a base class the program is ill-formed.
+ if (HasOverrideAttr && !HasOverriddenMethods) {
+ SemaRef.Diag(MD->getLocation(), diag::err_override_function_not_overriding)
+ << MD->getDeclName();
+ return;
+ }
+}
+
NamedDecl*
Sema::ActOnFunctionDeclarator(Scope* S, Declarator& D, DeclContext* DC,
QualType R, TypeSourceInfo *TInfo,
MarkUnusedFileScopedDecl(NewFD);
+ CheckClassMemberNameAttributes(*this, NewFD);
+
return NewFD;
}
// Flexible array member.
// Microsoft is more permissive regarding flexible array.
// It will accept flexible array in union and also
- // as the sole element of a struct/class.
+ // as the sole element of a struct/class.
if (getLangOptions().Microsoft) {
if (Record->isUnion())
Diag(FD->getLocation(), diag::ext_flexible_array_union)
--- /dev/null
+// RUN: %clang_cc1 -std=c++0x -fsyntax-only -verify %s
+
+struct A {
+ virtual void f();
+ virtual void h();
+};
+
+struct B : A {
+ [[override]] virtual void f();
+ [[override]] void g(); // expected-error {{'override' attribute only applies to virtual method types}}
+ [[override, override]] void h(); // expected-error {{'override' attribute cannot be repeated}}
+};