aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/stmt.c5
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d26f0d5..7cffb9f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+Wed Mar 29 10:53:49 2000 Jeffrey A Law (law@cygnus.com)
+
+ * stmt.c (stmt_loop_nest_empty): Allow cfun->stmt to be NULL.
+
2000-03-29 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* c-common.c (c_common_nodes_and_builtins): Don't special case
diff --git a/gcc/stmt.c b/gcc/stmt.c
index f807554..e4f14cf 100644
--- a/gcc/stmt.c
+++ b/gcc/stmt.c
@@ -2618,7 +2618,10 @@ expand_exit_loop_if_false (whichloop, cond)
int
stmt_loop_nest_empty ()
{
- return (loop_stack == NULL);
+ /* cfun->stmt can be NULL if we are building a call to get the
+ EH context for a setjmp/longjmp EH target and the current
+ function was a deferred inline function. */
+ return (cfun->stmt != NULL && loop_stack == NULL);
}
/* Return non-zero if we should preserve sub-expressions as separate