From: Volker Reichelt <reichelt@igpm.rwth-aachen.de>
Date: Mon, 15 May 2006 09:13:51 +0000 (+0000)
Subject: re PR c++/27315 (ICE with ill-placed expression)
X-Git-Tag: releases/gcc-4.0.4~691
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7810d41b76d0d09ad8e79b4a81606ce38b9f1e78;p=thirdparty%2Fgcc.git

re PR c++/27315 (ICE with ill-placed expression)

	PR c++/27315
	* pt.c (do_decl_instantiation): Return early on invalid decl.

	* g++.dg/template/operator6.C: New test.
	* g++.dg/template/incomplete3.C: New test.

From-SVN: r113780
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 26fa4eea0ed5..58d3c4576592 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-15  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/27315
+	* pt.c (do_decl_instantiation): Return early on invalid decl.
+
 2006-05-11  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
 	PR c++/27547
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 8277fc5972fe..26c63d81759b 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -11042,7 +11042,7 @@ do_decl_instantiation (tree decl, tree storage)
   tree result = NULL_TREE;
   int extern_p = 0;
 
-  if (!decl)
+  if (!decl || decl == error_mark_node)
     /* An error occurred, for which grokdeclarator has already issued
        an appropriate message.  */
     return;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b1e075fe42fc..2b68cad1a3db 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-15  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	PR c++/27315
+	* g++.dg/template/operator6.C: New test.
+	* g++.dg/template/incomplete3.C: New test.
+
 2005-05-13  Zdenek Dvorak  <dvorakz@suse.cz>
 
 	PR rtl-optimization/27335
diff --git a/gcc/testsuite/g++.dg/template/incomplete3.C b/gcc/testsuite/g++.dg/template/incomplete3.C
new file mode 100644
index 000000000000..39a2f237354f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/incomplete3.C
@@ -0,0 +1,5 @@
+// PR c++/27315
+// { dg-do compile }
+
+struct A;                  // { dg-error "forward declaration" }
+template void A::foo<0>(); // { dg-error "before|undefined" }
diff --git a/gcc/testsuite/g++.dg/template/operator6.C b/gcc/testsuite/g++.dg/template/operator6.C
new file mode 100644
index 000000000000..94a869bccd5f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/operator6.C
@@ -0,0 +1,4 @@
+// PR c++/27315
+// { dg-do compile }
+
+template void operator+; // { dg-error "non-function" }