Give nicer note when a member redeclaration has or lacks 'const'

llvm-svn: 141555

2 files changed, 17 insertions, 4 deletions

diff --git a/clang/test/SemaCXX/function-redecl.cpp b/clang/test/SemaCXX/function-redecl.cpp
index 2bc04a6d077..b19bff65430 100644
--- a/clang/test/SemaCXX/function-redecl.cpp
+++ b/clang/test/SemaCXX/function-redecl.cpp
@@ -62,7 +62,7 @@ struct Foo {
 }
 
 class Bar {
-  void f(test1::Foo::Inner foo) const; // expected-note {{member declaration nearly matches}}
+  void f(test1::Foo::Inner foo) const; // expected-note {{member declaration does not match because it is const qualified}}
 };
 
 using test1::Foo;
@@ -79,3 +79,16 @@ class Crash {
 void Crash::cart(int count) const {} // expected-error {{out-of-line definition of 'cart' does not match any declaration in 'Crash'}}
 // ...while this one crashed clang
 void Crash::chart(int count) const {} // expected-error {{out-of-line definition of 'chart' does not match any declaration in 'Crash'}}
+
+class TestConst {
+ public:
+  int getit() const; // expected-note {{member declaration does not match because it is const qualified}}
+  void setit(int); // expected-note {{member declaration does not match because it is not const qualified}}
+};
+
+int TestConst::getit() { // expected-error {{out-of-line definition of 'getit' does not match any declaration in 'TestConst'}}
+  return 1;
+}
+
+void TestConst::setit(int) const { // expected-error {{out-of-line definition of 'setit' does not match any declaration in 'TestConst'}}
+}
diff --git a/clang/test/SemaCXX/nested-name-spec.cpp b/clang/test/SemaCXX/nested-name-spec.cpp
index 8e73c3e2ed3..e13030cc38a 100644
--- a/clang/test/SemaCXX/nested-name-spec.cpp
+++ b/clang/test/SemaCXX/nested-name-spec.cpp
@@ -27,10 +27,10 @@ int A::C::cx = 17;
 static int A::C::cx2 = 17; // expected-error{{'static' can}}
 
 class C2 {
-  void m(); // expected-note{{member declaration nearly matches}}
+  void m(); // expected-note{{member declaration does not match because it is not const qualified}}
 
   void f(const int& parm); // expected-note{{type of 1st parameter of member declaration does not match definition ('const int &' vs 'int')}}
-  void f(int) const; // expected-note{{member declaration nearly matches}}
+  void f(int) const; // expected-note{{member declaration does not match because it is const qualified}}
   void f(float);
 
   int x;
@@ -121,7 +121,7 @@ namespace E {
 
 
 class Operators {
-  Operators operator+(const Operators&) const; // expected-note{{member declaration nearly matches}}
+  Operators operator+(const Operators&) const; // expected-note{{member declaration does not match because it is const qualified}}
   operator bool();
 };