From: Jason Merrill <jason@redhat.com>
Date: Tue, 22 Dec 2015 21:46:38 +0000 (-0500)
Subject: re PR c++/67339 (Segfault when parsing a typename involving a template-alias)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d2889b14274f623af7022b060cd49b08ada66038;p=gcc.git

re PR c++/67339 (Segfault when parsing a typename involving a template-alias)

	PR c++/67339
	* parser.c (cp_parser_elaborated_type_specifier): Use CLASS_TYPE_P
	rather than check for RECORD_TYPE.

From-SVN: r231912
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 1d4714ac65b..dbc7b3e8007 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2015-12-22  Jason Merrill  <jason@redhat.com>
+
+	PR c++/67339
+	* parser.c (cp_parser_elaborated_type_specifier): Use CLASS_TYPE_P
+	rather than check for RECORD_TYPE.
+
 2015-12-22  Patrick Palka  <ppalka@gcc.gnu.org>
 
 	* pt.c (make_pack_expansion): Make sure to initialize
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index c1948c463eb..262bfb28805 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -16880,7 +16880,7 @@ cp_parser_elaborated_type_specifier (cp_parser* parser,
     {
       /* Indicate whether this class was declared as a `class' or as a
 	 `struct'.  */
-      if (TREE_CODE (type) == RECORD_TYPE)
+      if (CLASS_TYPE_P (type))
 	CLASSTYPE_DECLARED_CLASS (type) = (tag_type == class_type);
       cp_parser_check_class_key (tag_type, type);
     }
diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-pmf1.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-pmf1.C
new file mode 100644
index 00000000000..d0ac27d893c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-pmf1.C
@@ -0,0 +1,16 @@
+// PR c++/67339
+// { dg-do compile { target c++11 } }
+
+template < typename T>
+struct A
+{
+    void foo();
+    template < typename S, typename W >
+        using N = void (T::*)(S, W) const ;
+};
+
+template < typename T>
+void A<T>::foo()
+{
+    typename A<T>::template N<int, int> fun = &T::out;
+}