Better diagnostic for superfluous scope specifier inside a class definition for member functions. + Fixit.

Example: 
class A {
   void A::foo(); //warning: extra qualification on member 'foo'
};

llvm-svn: 115347

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -2140,6 +2140,8 @@ def err_qualified_param_declarator : Error<
 def ext_out_of_line_declaration : ExtWarn<
   "out-of-line declaration of a member must be a definition">,
   InGroup<OutOfLineDeclaration>, DefaultError;
+def warn_member_extra_qualification : Warning<
+  "extra qualification on member %0">;
 def note_member_def_close_match : Note<"member declaration nearly matches">;
 def err_typecheck_ivar_variable_size : Error<
   "instance variables must have a constant size">;

clang/lib/Sema/SemaDecl.cpp

@@ -3687,6 +3687,7 @@ Sema::ActOnFunctionDeclarator(Scope* S, Declarator& D, DeclContext* DC,
   }
 
   if (D.getCXXScopeSpec().isSet() && !NewFD->isInvalidDecl()) {
+    if (!CurContext->isRecord()) {
       // Fake up an access specifier if it's supposed to be a class member.
       if (!Redeclaration && isa<CXXRecordDecl>(NewFD->getDeclContext()))
         NewFD->setAccess(AS_public);
@@ -3733,6 +3734,15 @@ Sema::ActOnFunctionDeclarator(Scope* S, Declarator& D, DeclContext* DC,
             Diag((*Func)->getLocation(), diag::note_member_def_close_match);
         }
       }
+    } else if (!isFriend) { 
+      // The user provided a superfluous scope specifier inside a class definition:
+      //
+      // class X {
+      //   void X::f();
+      // };
+      Diag(NewFD->getLocation(), diag::warn_member_extra_qualification)
+        << Name << FixItHint::CreateRemoval(D.getCXXScopeSpec().getRange());
+    }
   }
 
   // Handle attributes. We need to have merged decls when handling attributes

clang/test/FixIt/fixit.cpp

@@ -66,3 +66,8 @@ CT<1> main(void); // expected-error{{'main' must return 'int'}}
 // typedef CT<1> mainT(void);
 // mainT main; // TODO
 
+// extra qualification on member
+class C {
+  int C::foo();
+};
+

clang/test/SemaCXX/class.cpp

@@ -117,7 +117,7 @@ struct C4 {
 struct S
 {
   void f(); // expected-note 1 {{previous declaration}}
-  void S::f() {} // expected-error {{class member cannot be redeclared}} expected-note {{previous declaration}} expected-note {{previous definition}}
+  void S::f() {} // expected-warning {{extra qualification on member}} expected-error {{class member cannot be redeclared}} expected-note {{previous declaration}} expected-note {{previous definition}}
   void f() {} // expected-error {{class member cannot be redeclared}} expected-error {{redefinition}}
 };
 

clang/test/SemaCXX/nested-name-spec.cpp

@@ -244,3 +244,7 @@ namespace PR7133 {
     return false;
   }
 }
+
+class CLASS {
+  void CLASS::foo2(); // expected-warning {{extra qualification on member 'foo2'}}
+};