Disable for functions that were already virtual

Author: DKLoehr

clang/lib/Sema/SemaDeclCXX.cpp

@@ -7196,15 +7196,14 @@ void Sema::CheckCompletedCXXClass(Scope *S, CXXRecordDecl *Record) {
 
         if (M->hasAttr<OverrideAttr>()) {
           HasMethodWithOverrideControl = true;
+        } else if (M->size_overridden_methods() > 0) {
+          HasOverridingMethodWithoutOverrideControl = true;
         } else {
-          if (M->size_overridden_methods() > 0)
-            HasOverridingMethodWithoutOverrideControl = true;
-
-          // Warn on virtual methods in final classes, unless they're also
-          // marked `override`.
-          if (M->isVirtualAsWritten() && Record->isEffectivelyFinal())
+          // Warn on newly-declared virtual methods in `final` classes
+          if (M->isVirtualAsWritten() && Record->isEffectivelyFinal()) {
             Diag(M->getLocation(), diag::warn_unnecessary_virtual_specifier)
                 << M;
+          }
         }
       }
 

clang/test/SemaCXX/unnecessary-virtual-specifier.cpp

@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -verify -Wunnecessary-virtual-specifier %s
+// RUN: %clang_cc1 -fsyntax-only -verify -Wunnecessary-virtual-specifier -Wno-inconsistent-missing-override %s
 
 struct Foo final {
   Foo() = default;
@@ -15,15 +15,17 @@ struct Foo final {
 struct BarBase {
   virtual ~BarBase() = delete;
   virtual void virt() {}
-  virtual int virt(int);
+  virtual int  virt2(int);
+  virtual bool virt3(bool);
   int nonvirt();
 };
 
 struct Bar final : BarBase {
   ~Bar() override = delete;
-  void virt() override {};
-  // `virtual ... override;` is a common pattern, so don't warn
-  virtual int virt(int) override;
-  virtual int virt(bool);                        // expected-warning {{virtual method}}
+          void virt() override {};
+  virtual int  virt2(int) override;               // `virtual ... override;` is a common pattern, so don't warn
+  virtual bool virt3(bool);                       // Already virtual in the base class; triggers
+                                                  // -Winconsistent-missing-override or -Wsuggest-override instead
+  virtual int  new_virt(bool);                    // expected-warning {{virtual method}}
   int nonvirt();
 };