From: Jakub Jelinek <jakub@redhat.com>
Date: Sat, 2 Sep 2006 06:54:04 +0000 (+0200)
Subject: re PR c++/28878 (ICE using "[" instead of "{")
X-Git-Tag: releases/gcc-4.2.0~1553
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=07515729e96d9c36052b6894c3c49afa8a2582b7;p=thirdparty%2Fgcc.git

re PR c++/28878 (ICE using "[" instead of "{")

	PR c++/28878
	* except.c (build_throw): Only set current_function_returns_abnormally
	if cfun is not NULL.

	* g++.dg/parse/crash33.C: New test.

From-SVN: r116655
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5f37ddecd4b8..4709c147aeb0 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2006-09-02  Jakub Jelinek  <jakub@redhat.com>
 
+	PR c++/28878
+	* except.c (build_throw): Only set current_function_returns_abnormally
+	if cfun is not NULL.
+
 	PR c++/26917
 	* repo.c (repo_file): Remove.
 	(open_repo_file, reopen_repo_file_for_write): Return fopened
diff --git a/gcc/cp/except.c b/gcc/cp/except.c
index ad493aa389ca..f97ab063dde5 100644
--- a/gcc/cp/except.c
+++ b/gcc/cp/except.c
@@ -605,7 +605,8 @@ build_throw (tree exp)
 
   if (processing_template_decl)
     {
-      current_function_returns_abnormally = 1;
+      if (cfun)
+	current_function_returns_abnormally = 1;
       return build_min (THROW_EXPR, void_type_node, exp);
     }
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e4210b84567d..a8c9b6200a67 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-02  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/28878
+	* g++.dg/parse/crash33.C: New test.
+
 2006-09-01  J"orn Rennecke  <joern.rennecke@st.com>
 	Richard Guenther  <rguenther@suse.de>
 	Adam Nemet  <anemet@caviumnetworks.com>
diff --git a/gcc/testsuite/g++.dg/parse/crash33.C b/gcc/testsuite/g++.dg/parse/crash33.C
new file mode 100644
index 000000000000..2ab84df46d37
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/crash33.C
@@ -0,0 +1,8 @@
+// PR c++/28878
+// { dg-do compile }
+
+template<int>
+void foo()
+[
+  throw;	// { dg-error "expected" }
+}		// { dg-error "expected" }