From: Adam Butcher <adam@jessamine.co.uk>
Date: Mon, 23 Sep 2013 22:43:44 +0000 (+0100)
Subject: Fix 58500.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ef4369671c4948c08c88965a913a8401a0bae8a7;p=gcc.git

Fix 58500.

gcc/cp/
	PR c++/58500
	* type-utils.h (find_type_usage): Only traverse one type level into
	member function pointers.

gcc/testsuite/
	PR c++/58500
	* g++.dg/cpp1y/pr58500.C: New testcase.

From-SVN: r202851
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 380fae9db42..ec40ed5c061 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-23  Adam Butcher  <adam@jessamine.co.uk>
+
+	PR c++/58500
+	* type-utils.h (find_type_usage): Only traverse one type level into
+	member function pointers.
+
 2013-09-23  Adam Butcher  <adam@jessamine.co.uk>
 
 	* parser.c (cp_parser_init_declarator): Defer calling
diff --git a/gcc/cp/type-utils.h b/gcc/cp/type-utils.h
index 3e82ca4f957..2febce76075 100644
--- a/gcc/cp/type-utils.h
+++ b/gcc/cp/type-utils.h
@@ -47,7 +47,7 @@ find_type_usage (tree t, bool (*pred) (const_tree))
 
   if (TYPE_PTRMEMFUNC_P (t))
     return find_type_usage
-      (TREE_TYPE (TREE_TYPE (TYPE_PTRMEMFUNC_FN_TYPE (t))), pred);
+      (TREE_TYPE (TYPE_PTRMEMFUNC_FN_TYPE (t)), pred);
 
   return NULL_TREE;
 }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8a197107f86..4101cc285f0 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-23  Adam Butcher  <adam@jessamine.co.uk>
+
+	PR c++/58500
+	* g++.dg/cpp1y/pr58500.C: New testcase.
+
 2013-09-23  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gnat.dg/opt28.ad[sb]: New test.
diff --git a/gcc/testsuite/g++.dg/cpp1y/pr58500.C b/gcc/testsuite/g++.dg/cpp1y/pr58500.C
new file mode 100644
index 00000000000..b9d4a26d415
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1y/pr58500.C
@@ -0,0 +1,8 @@
+// { dg-do compile }
+// { dg-options "-std=gnu++1y" }
+
+// PR c++/58500
+
+struct A {};
+
+void foo(auto (A::*)());