From: Jason Merrill <jason@redhat.com>
Date: Mon, 2 Feb 2009 19:57:29 +0000 (-0500)
Subject: re PR c++/39054 (ICE with invalid pseudo-dtor in template)
X-Git-Tag: releases/gcc-4.3.4~361
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fbecb32274632fcf7beb94fa7ee567ef1c7ed69;p=thirdparty%2Fgcc.git

re PR c++/39054 (ICE with invalid pseudo-dtor in template)

        PR c++/39054
        * parser.c (cp_parser_unqualified_id): Don't wrap error_mark_node
        in BIT_NOT_EXPR.

From-SVN: r143879
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5a99a16453e3..ee9a08fb996c 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-02  Jason Merrill  <jason@redhat.com>
+
+	PR c++/39054
+	* parser.c (cp_parser_unqualified_id): Don't wrap error_mark_node 
+	in BIT_NOT_EXPR.
+
 2009-01-26  Jason Merrill  <jason@redhat.com>
 
 	PR c++/23287
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 2181275b5e4b..463fc5436772 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -3807,7 +3807,9 @@ cp_parser_unqualified_id (cp_parser* parser,
 		/* We couldn't find a type with this name, so just accept
 		   it and check for a match at instantiation time.  */
 		type_decl = cp_parser_identifier (parser);
-		return build_nt (BIT_NOT_EXPR, type_decl);
+		if (type_decl != error_mark_node)
+		  type_decl = build_nt (BIT_NOT_EXPR, type_decl);
+		return type_decl;
 	      }
 	  }
 	/* If an error occurred, assume that the name of the
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4df4cf2522ee..54e2db01b5ca 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-02  Jason Merrill  <jason@redhat.com>
+
+	PR c++/39054
+	* g++.dg/parse/dtor14.C: New test.
+
 2009-01-30  H.J. Lu  <hongjiu.lu@intel.com>
 
 	Backport from mainline:
diff --git a/gcc/testsuite/g++.dg/parse/dtor14.C b/gcc/testsuite/g++.dg/parse/dtor14.C
new file mode 100644
index 000000000000..6ba7a5b6c325
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/dtor14.C
@@ -0,0 +1,8 @@
+// PR c++/39054
+
+struct A {};
+
+template<typename> void foo()
+{ 
+  A().~int();			// { dg-error "expected" }
+}