Method->isOutOfLine())
return;
- if ((Method->getAttr<clang::OverrideAttr>() != nullptr ||
- Method->getAttr<clang::FinalAttr>() != nullptr) &&
- !Method->isVirtualAsWritten())
+ bool HasVirtual = Method->isVirtualAsWritten();
+ bool HasOverride = Method->getAttr<OverrideAttr>();
+ bool HasFinal = Method->getAttr<FinalAttr>();
+
+ bool OnlyVirtualSpecified = HasVirtual && !HasOverride && !HasFinal;
+ unsigned KeywordCount = HasVirtual + HasOverride + HasFinal;
+
+ if (!OnlyVirtualSpecified && KeywordCount == 1)
return; // Nothing to do.
DiagnosticBuilder Diag =
diag(Method->getLocation(),
- "Prefer using 'override' or 'final' instead of 'virtual'");
+ OnlyVirtualSpecified
+ ? "Prefer using 'override' or 'final' instead of 'virtual'"
+ : "Use exactly one of 'virtual', 'override' and 'final'");
CharSourceRange FileRange =
Lexer::makeFileCharRange(CharSourceRange::getTokenRange(
Result.Context->getLangOpts());
// Add 'override' on inline declarations that don't already have it.
- if (Method->getAttr<clang::OverrideAttr>() == nullptr &&
- Method->getAttr<clang::FinalAttr>() == nullptr) {
+ if (!HasFinal && !HasOverride) {
SourceLocation InsertLoc;
StringRef ReplacementText = "override ";
Diag << FixItHint::CreateInsertion(InsertLoc, ReplacementText);
}
+ if (HasFinal && HasOverride) {
+ SourceLocation OverrideLoc = Method->getAttr<OverrideAttr>()->getLocation();
+ Diag << FixItHint::CreateRemoval(
+ CharSourceRange::getTokenRange(OverrideLoc, OverrideLoc));
+ }
+
if (Method->isVirtualAsWritten()) {
for (Token Tok : Tokens) {
if (Tok.is(tok::raw_identifier) && GetText(Tok, Sources) == "virtual") {
virtual void j() const;
virtual MustUseResultObject k();
virtual bool l() MUST_USE_RESULT;
+
+ virtual void m();
};
struct SimpleCases : public Base {
// CHECK: {{^ MustUseResultObject k\(\) override;}}
virtual bool l() MUST_USE_RESULT; // Has an explicit attribute
// CHECK: {{^ bool l\(\) override MUST_USE_RESULT;}}
+
+ virtual void m() override final;
+ // CHECK: {{^ void m\(\) final;}}
};
void SimpleCases::i() {}
#define F virtual void f();
F
// CHECK: {{^ F}}
+
+ VIRTUAL void g() OVERRIDE final;
+ // CHECK: {{^ VIRTUAL void g\(\) final;}}
};
// Tests for templates.
virtual void b();
virtual void c();
virtual void d();
+ virtual void e();
+ virtual void f();
};
struct SimpleCases : public Base {
// CHECK: :[[@LINE-1]]:11: warning: Prefer using 'override' or 'final' instead of 'virtual'
void a();
- // CHECK: :[[@LINE-1]]:8: warning: Prefer using
+ // CHECK: :[[@LINE-1]]:8: warning: Use exactly
virtual void b();
// CHECK: :[[@LINE-1]]:16: warning: Prefer using
- void c() override;
+ virtual void c() override;
+ // CHECK: :[[@LINE-1]]:16: warning: Use exactly
+ void d() override final;
+ // CHECK: :[[@LINE-1]]:8: warning: Use exactly
+ void e() override;
// CHECK-NOT: :[[@LINE-1]]:{{.*}} warning:
- void d() final;
+ void f() final;
// CHECK-NOT: :[[@LINE-1]]:{{.*}} warning:
};