Update clang to r93512.

1 files changed, 13 insertions, 1 deletions

diff --git a/test/SemaCXX/member-pointer.cpp b/test/SemaCXX/member-pointer.cpp
index 65d05eb..3d9d5b5e 100644
--- a/test/SemaCXX/member-pointer.cpp
+++ b/test/SemaCXX/member-pointer.cpp
@@ -80,7 +80,7 @@ void g() {
 
   void (HasMembers::*pmf)() = &HasMembers::f;
   void (*pnf)() = &Fake::f;
-  &hm.f; // FIXME: needs diagnostic expected-warning{{result unused}}
+  &hm.f; // expected-error {{must explicitly qualify}} expected-warning{{result unused}}
 
   void (HasMembers::*pmgv)() = &HasMembers::g;
   void (HasMembers::*pmgi)(int) = &HasMembers::g;
@@ -136,3 +136,15 @@ void i() {
   OverloadsPtrMem m;
   int foo = m->*"Awesome!";
 }
+
+namespace pr5985 {
+  struct c {
+    void h();
+    void f() {
+      void (c::*p)();
+      p = &h; // expected-error {{must explicitly qualify}}
+      p = &this->h; // expected-error {{must explicitly qualify}}
+      p = &(*this).h; // expected-error {{must explicitly qualify}}
+    }
+  };
+}