diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 585dc72eb733..f07ba4d25862 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-18  Alexandre Oliva  <aoliva@redhat.com>
+
+	* tree-cfg.c (dump_function_to_file): Do not crash if cfun or
+	cfun->cfg are NULL.
+
 2005-04-18  Tom Tromey  <tromey@redhat.com>
 
 	* cgraphunit.c (cgraph_finalize_compilation_unit): Fix a comment
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index 6bed701e5da6..cfdf14c1ca1c 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -5183,7 +5183,7 @@ dump_function_to_file (tree fn, FILE *file, int flags)
 	}
     }
 
-  if (basic_block_info)
+  if (cfun && cfun->cfg && basic_block_info)
     {
       /* Make a CFG based dump.  */
       check_bb_profile (ENTRY_BLOCK_PTR, file);