diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1d240ef1d4b..73e4124cc83 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep 21 05:29:17 1999  Richard Earnshaw (rearnsha@arm.com)
+
+	* stmt.c (any_pending_cleanups): Don't crash when 
+	current_function->stmt is unset.
+
 Tue Sep 21 00:59:49 1999  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
 
 	* emit-rtl.c (init_emit_once): Initialize const_int_rtx before
diff --git a/gcc/stmt.c b/gcc/stmt.c
index 1100733374b..6483da5bcc5 100644
--- a/gcc/stmt.c
+++ b/gcc/stmt.c
@@ -4334,7 +4334,8 @@ any_pending_cleanups (this_contour)
 {
   struct nesting *block;
 
-  if (block_stack == 0)
+  if (current_function == NULL || current_function->stmt == NULL
+      || block_stack == 0)
     return 0;
 
   if (this_contour && block_stack->data.block.cleanups != NULL)