2 files changed, 12 insertions, 3 deletions
diff --git a/clang/test/SemaTemplate/instantiate-method.cpp b/clang/test/SemaTemplate/instantiate-method.cpp
index 2351d882f9c..231e2812f66 100644
--- a/clang/test/SemaTemplate/instantiate-method.cpp
+++ b/clang/test/SemaTemplate/instantiate-method.cpp
@@ -95,9 +95,7 @@ struct X0 : X0Base {
 template<typename U>
 struct X1 : X0<U> {
   int &f2() { 
-    // FIXME: We should be able to do this lookup and diagnose the error
-    // *despite* the fact that we can't decide the relationship yet.
-    return X0Base::f(); // expected-FIXME-error{{call to non-static member function without an object argument}}
+    return X0Base::f();
   }
 };
 
diff --git a/clang/test/SemaTemplate/qualified-id.cpp b/clang/test/SemaTemplate/qualified-id.cpp
index a07f05ca78e..ab57950acff 100644
--- a/clang/test/SemaTemplate/qualified-id.cpp
+++ b/clang/test/SemaTemplate/qualified-id.cpp
@@ -18,3 +18,14 @@ namespace test1 {
     }
   };
 }
+
+namespace test2 {
+  class Impl {
+    int foo();
+  };
+  template <class T> class Magic : public Impl {
+    int foo() {
+      return Impl::foo();
+    }
+  };
+}