Fix overload resolution when calling a member template or taking the

address of a member template when explicit template arguments are
provided.

llvm-svn: 84991

1 files changed, 26 insertions, 1 deletions

diff --git a/clang/test/SemaTemplate/member-template-access-expr.cpp b/clang/test/SemaTemplate/member-template-access-expr.cpp
index 0f9f21f339d..feef7926fb7 100644
--- a/clang/test/SemaTemplate/member-template-access-expr.cpp
+++ b/clang/test/SemaTemplate/member-template-access-expr.cpp
@@ -1,5 +1,4 @@
 // RUN: clang-cc -fsyntax-only -verify %s
-
 template<typename U, typename T>
 U f0(T t) {
   return t.template get<U>();
@@ -50,3 +49,29 @@ B<T>::destroy()
 void do_destroy_B(B<int> b) {
   b.destroy();
 }
+
+struct X1 {
+  int* f1(int);
+  template<typename T> float* f1(T);
+  
+  static int* f2(int);
+  template<typename T> static float* f2(T);
+};
+
+void test_X1(X1 x1) {
+  float *fp1 = x1.f1<>(17);
+  float *fp2 = x1.f1<int>(3.14);
+  int *ip1 = x1.f1(17);
+  float *ip2 = x1.f1(3.14);
+  
+  float* (X1::*mf1)(int) = &X1::f1;
+  float* (X1::*mf2)(int) = &X1::f1<>;
+  float* (X1::*mf3)(float) = &X1::f1<float>;
+  
+  float* (*fp3)(int) = &X1::f2;
+  float* (*fp4)(int) = &X1::f2<>;
+  float* (*fp5)(float) = &X1::f2<float>;  
+  float* (*fp6)(int) = X1::f2;
+  float* (*fp7)(int) = X1::f2<>;
+  float* (*fp8)(float) = X1::f2<float>;  
+}