summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2004-04-08 13:38:00 +0000
committerjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2004-04-08 13:38:00 +0000
commit5a9896f41838369ea1ecb4e28ba85c14ecf2e861 (patch)
treedeb8ed628fbc0187b79f6c48de164184eaf50581
parent57a92eca023f615ea2811abd3890bf70331948ab (diff)
downloadppe42-gcc-5a9896f41838369ea1ecb4e28ba85c14ecf2e861.tar.gz
ppe42-gcc-5a9896f41838369ea1ecb4e28ba85c14ecf2e861.zip
* decl2.c (mark_used): Don't segfault if cfun != NULL but
current_function_decl == NULL. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@80506 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/decl2.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d183371978e..d1873a8a20a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-08 Jakub Jelinek <jakub@redhat.com>
+
+ * decl2.c (mark_used): Don't segfault if cfun != NULL but
+ current_function_decl == NULL.
+
2004-04-05 Nathan Sidwell <nathan@codesourcery.com>
PR c++/3518
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 0a4e8e9d0d2..de09eb69261 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -3030,6 +3030,7 @@ mark_used (tree decl)
generate its body to find that out. */
|| TREE_NOTHROW (decl)
|| !cfun
+ || !current_function_decl
/* If we already know the current function can't throw,
then we don't need to work hard to prove it. */
|| TREE_NOTHROW (current_function_decl)
OpenPOWER on IntegriCloud