re PR c++/57825 (Template specialization for ref qualified member pointers)

	PR c++/57825
	* tree.c (strip_typedefs) [METHOD_TYPE]: Preserve ref-qualifier.

From-SVN: r201550

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f85fd3f1b32c51c8ebaa779ade803d389bd07c5f..5083f7016ccc0a4ae704234e784a154e862941dd 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-06  Jason Merrill  <jason@redhat.com>
+
+       PR c++/57825
+       * tree.c (strip_typedefs) [METHOD_TYPE]: Preserve ref-qualifier.
+
 2013-08-05  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR c++/58080

diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index f8b4bbce822144cb3399078346d3096178171332..63ec7fa72663f7796148b4bdb7816be3c8362db9 100644 (file)
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -1236,6 +1236,8 @@ strip_typedefs (tree t)
            result =
              build_method_type_directly (class_type, type,
                                          TREE_CHAIN (arg_types));
+           result
+             = build_ref_qualified_type (result, type_memfn_rqual (t));
          }
        else
          {

diff --git a/gcc/testsuite/g++.dg/cpp0x/ref-qual14.C b/gcc/testsuite/g++.dg/cpp0x/ref-qual14.C
new file mode 100644 (file)
index 0000000..8e55551
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/ref-qual14.C
@@ -0,0 +1,18 @@
+// PR c++/57825
+// { dg-do compile { target c++11 } }
+
+template<typename T>
+struct target_class
+{};
+
+template<typename Class, typename Ret, typename... Args>
+struct target_class<Ret (Class::*)(Args...)>
+{};
+
+template<typename Class, typename Ret, typename... Args>
+struct target_class<Ret (Class::*)(Args...) &>
+{};
+
+template<typename Class, typename Ret, typename... Args>
+struct target_class<Ret (Class::*)(Args...) &&>
+{};