From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Wed, 15 Sep 2010 09:06:32 +0000 (+0000)
Subject: re PR c++/45665 (ICE: tree check: expected class 'type', have 'exceptional' (error_ma... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6809f4b50e4832e87fc3d68c3a813f8c6b4a17ee;p=gcc.git

re PR c++/45665 (ICE: tree check: expected class 'type', have 'exceptional' (error_mark) in grokdeclarator, at cp/decl.c:8797 on invalid code)

/cp
2010-09-15  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/45665
	* decl.c (grokdeclarator): Check build_memfn_type return value
	for error_mark_node.

/testsuite
2010-09-15  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/45665
	* g++.dg/template/crash103.C: New.

From-SVN: r164299
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ee9944cad5a..20887a064d5 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-15  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/45665
+	* decl.c (grokdeclarator): Check build_memfn_type return value
+	for error_mark_node.
+
 2010-09-13  Rodrigo Rivas Costa <rodrigorivascosta@gmail.com>
 
 	* semantics.c (finish_for_stmt): Always test flag_new_for_scope.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 8ca69da2866..3d1420a23eb 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -8762,6 +8762,8 @@ grokdeclarator (const cp_declarator *declarator,
 	      type = build_memfn_type (type,
 				       declarator->u.pointer.class_type,
 				       memfn_quals);
+	      if (type == error_mark_node)
+		return error_mark_node;
 	      memfn_quals = TYPE_UNQUALIFIED;
 	    }
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index dc91d215045..72f7e71930b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-15  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/45665
+	* g++.dg/template/crash103.C: New.
+
 2010-09-15  Nicola Pero  <nicola.pero@meta-innovation.com>
 
 	Merge from 'apple/trunk' branch on FSF servers.
@@ -12,7 +17,7 @@
 
 	Radar 4219590
 	* objc.dg/break-in-ifstmt.m: New.
-	
+
 	2005-08-22  Ziemowit Laski  <zlaski@apple.com>
 
 	Radar 4174166
@@ -24,7 +29,7 @@
 	Radar 4216500
 	* obj-c++.dg/proto-lossage-7.mm: New.
 	* objc.dg/proto-lossage-7.m: New.
-	
+
 2010-09-14  Jan Hubicka  <jh@suse.cz>
 
 	* gfortran.dg/vect/fast-math-pr38968.f90: Add common to prevent
diff --git a/gcc/testsuite/g++.dg/template/crash103.C b/gcc/testsuite/g++.dg/template/crash103.C
new file mode 100644
index 00000000000..9f3e224e711
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/crash103.C
@@ -0,0 +1,4 @@
+// PR c++/45665
+
+template < typename > struct S;
+void (S <0>::*ptr) (); // { dg-error "type" }