diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3abf3ede110..4cb520b22c8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-12  Zdenek Dvorak  <dvorakz@suse.cz>
+
+	PR tree-optimization/30835
+	* lambda-code.c (can_convert_to_perfect_nest): Check whether
+	bb_for_stmt is not NULL before accessing it.
+
 2007-03-12  Joseph Myers  <joseph@codesourcery.com>
 
 	* gcc.c (main): Handle target_sysroot_hdrs_suffix being NULL for
@@ -33,9 +39,9 @@
 
 2007-03-12  Richard Henderson  <rth@redhat.com>
 
-        * config/darwin.c (machopic_reloc_rw_mask): New.
-        * config/darwin-protos.h (machopic_reloc_rw_mask): Declare.
-        * config/darwin.h (TARGET_ASM_RELOC_RW_MASK): New.
+	* config/darwin.c (machopic_reloc_rw_mask): New.
+	* config/darwin-protos.h (machopic_reloc_rw_mask): Declare.
+	* config/darwin.h (TARGET_ASM_RELOC_RW_MASK): New.
 
 2007-03-12  Mark Mitchell  <mark@codesourcery.com>
 
diff --git a/gcc/lambda-code.c b/gcc/lambda-code.c
index d7632665fb5..487c6468de7 100644
--- a/gcc/lambda-code.c
+++ b/gcc/lambda-code.c
@@ -2363,8 +2363,9 @@ can_convert_to_perfect_nest (struct loop *loop)
 			      {
 				tree arg_stmt = SSA_NAME_DEF_STMT (arg);
 
-				if (bb_for_stmt (arg_stmt)->loop_father
-				    == loop->inner)
+				if (bb_for_stmt (arg_stmt)
+				    && (bb_for_stmt (arg_stmt)->loop_father
+					== loop->inner))
 				  goto fail;
 			      }
 			  }