aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2004-04-08 15:38:00 +0200
committerJakub Jelinek <jakub@gcc.gnu.org>2004-04-08 15:38:00 +0200
commita7485e9375687b897612280a3a33d45542783f6c (patch)
treedeb8ed628fbc0187b79f6c48de164184eaf50581 /gcc
parentaf15298919fc249fc35fc33144271c560c74939c (diff)
downloadgcc-a7485e9375687b897612280a3a33d45542783f6c.zip
gcc-a7485e9375687b897612280a3a33d45542783f6c.tar.gz
gcc-a7485e9375687b897612280a3a33d45542783f6c.tar.bz2
decl2.c (mark_used): Don't segfault if cfun != NULL but current_function_decl == NULL.
* decl2.c (mark_used): Don't segfault if cfun != NULL but current_function_decl == NULL. From-SVN: r80506
Diffstat (limited to 'gcc')
-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 d183371..d1873a8 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 0a4e8e9..de09eb6 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)