From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Tue, 22 Nov 2011 20:48:33 +0000 (+0000)
Subject: re PR c++/51265 (ICE in finish_decltype_type, at cp/semantics.c:5244)
X-Git-Tag: releases/gcc-4.7.0~2005
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8733916b600980c3c3b2603f7127dbf10c8a09f5;p=thirdparty%2Fgcc.git

re PR c++/51265 (ICE in finish_decltype_type, at cp/semantics.c:5244)

/cp
2011-11-22  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/51265
	* semantics.c (finish_decltype_type): Handle PTRMEM_CST.

/testsuite
2011-11-22  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/51265
	* g++.dg/cpp0x/decltype36.C: New.

From-SVN: r181638
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 867c45c7b8fe..9d8f47b8666f 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-22  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/51265
+	* semantics.c (finish_decltype_type): Handle PTRMEM_CST.
+
 2011-11-22  Dodji Seketeli  <dodji@redhat.com>
 
 	PR c++/51143
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index fe685fa15279..3c9853a3529c 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -5235,8 +5235,9 @@ finish_decltype_type (tree expr, bool id_expression_or_member_access_p,
           gcc_unreachable ();
 
         case INTEGER_CST:
+	case PTRMEM_CST:
           /* We can get here when the id-expression refers to an
-             enumerator.  */
+             enumerator or non-type template parameter.  */
           type = TREE_TYPE (expr);
           break;
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c21ee616c756..d0dd9b97afdf 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-22  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/51265
+	* g++.dg/cpp0x/decltype36.C: New.
+
 2011-11-22  Jakub Jelinek  <jakub@redhat.com>
 
 	PR tree-optimization/51074
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype36.C b/gcc/testsuite/g++.dg/cpp0x/decltype36.C
new file mode 100644
index 000000000000..f3dfed992cfd
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype36.C
@@ -0,0 +1,21 @@
+// PR c++/51265
+// { dg-options -std=c++0x }
+
+struct Funny
+{
+  int print(int);
+};
+
+template<typename X>
+void c();
+
+template<typename X, X ff>
+void xx()
+{
+  c<decltype(ff)>();
+}
+
+int main()
+{
+  xx<int(Funny::*)(int), &Funny::print>();
+}