From 67830b4d8b7e47ce821c37957279cc6d3ca88b14 Mon Sep 17 00:00:00 2001
From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 9 Jul 2013 17:55:24 +0000
Subject: [PATCH] 	PR c++/57831 	* pt.c (tsubst_copy): Handle
 USING_DECL.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@200839 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/cp/ChangeLog                        |  5 +++++
 gcc/cp/pt.c                             |  3 +++
 gcc/testsuite/g++.dg/template/using23.C | 15 +++++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/template/using23.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9262813..aa6bdb1 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-09  Jason Merrill  <jason@redhat.com>
+
+	PR c++/57831
+	* pt.c (tsubst_copy): Handle USING_DECL.
+
 2013-07-09  Marc Glisse  <marc.glisse@inria.fr>
 
 	PR c++/53094
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 26d5a1c..23229a9 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -12552,6 +12552,9 @@ tsubst_copy (tree t, tree args, tsubst_flags_t complain, tree in_decl)
     case TYPE_DECL:
       return tsubst (t, args, complain, in_decl);
 
+    case USING_DECL:
+      t = DECL_NAME (t);
+      /* Fall through.  */
     case IDENTIFIER_NODE:
       if (IDENTIFIER_TYPENAME_P (t))
 	{
diff --git a/gcc/testsuite/g++.dg/template/using23.C b/gcc/testsuite/g++.dg/template/using23.C
new file mode 100644
index 0000000..abb90de
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/using23.C
@@ -0,0 +1,15 @@
+// PR c++/57831
+
+struct A {
+  void f();
+};
+template <class T> struct B : T {
+  typedef T base;
+  using base::f;         // If I write "using B<T>::f" it's ok
+  void g( ) {
+    B<T>::f();           // This is OK as expected
+    (this->*&T::f)();    // This is also OK
+    (this->*&B<T>::f)(); // This causes error
+  }
+};
+template struct B< A >;
-- 
2.7.4