Move the "->" to "." fixit from r186128 into a separate note since

recovery is not attempted with the fixit. Also move the associated test
case from FixIt/fixit.cpp to SemaCXX/member-expr.cpp since the fixit is
no longer automatically applied.

llvm-svn: 186342

2 files changed, 15 insertions, 13 deletions

diff --git a/clang/test/FixIt/fixit.cpp b/clang/test/FixIt/fixit.cpp
index 400c227128a..3bd5b57a4ea 100644
--- a/clang/test/FixIt/fixit.cpp
+++ b/clang/test/FixIt/fixit.cpp
@@ -313,18 +313,6 @@ namespace PR5066 {
   X<int *p> x; // expected-error {{type-id cannot have a name}}
 }
 
-namespace PR15045 {
-  class Cl0 {
-  public:
-    int a;
-  };
-
-  int f() {
-    Cl0 c;
-    return c->a;  // expected-error {{member reference type 'PR15045::Cl0' is not a pointer; maybe you meant to use '.'?}}
-  }
-}
-
 namespace PR5898 {
   class A {
   public:
diff --git a/clang/test/SemaCXX/member-expr.cpp b/clang/test/SemaCXX/member-expr.cpp
index 515bcd43b2c..faa11711498 100644
--- a/clang/test/SemaCXX/member-expr.cpp
+++ b/clang/test/SemaCXX/member-expr.cpp
@@ -87,7 +87,8 @@ namespace test5 {
   }
 
   void test2(A &x) {
-    x->A::foo<int>(); // expected-error {{'test5::A' is not a pointer}}
+    x->A::foo<int>(); // expected-error {{'test5::A' is not a pointer}} \
+                      // expected-note {{did you meant to use '.' instead?}}
   }
 }
 
@@ -172,3 +173,16 @@ void f(int i) {
   j = 0;
 }
 }
+
+namespace PR15045 {
+  class Cl0 {
+  public:
+    int a;
+  };
+
+  int f() {
+    Cl0 c;
+    return c->a;  // expected-error {{member reference type 'PR15045::Cl0' is not a pointer}} \
+                  // expected-note {{did you meant to use '.' instead?}}
+  }
+}