diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e9ee311c356..6634f683c0d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-10  Ian Lance Taylor  <iant@google.com>
+
+	* emit-rtl.c (gen_reg_rtx): Check can_create_pseudo_p rather than
+	no_new_pseudos.
+
 2007-07-10  David Daney  <ddaney@avtrex.com>
 
 	* builtins.def (BUILT_IN_CLEAR_CACHE): New builtin.
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index 8f99b986ce0..d995348ec88 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -780,9 +780,7 @@ gen_reg_rtx (enum machine_mode mode)
   struct function *f = cfun;
   rtx val;
 
-  /* Don't let anything called after initial flow analysis create new
-     registers.  */
-  gcc_assert (!no_new_pseudos);
+  gcc_assert (can_create_pseudo_p ());
 
   if (generating_concat_p
       && (GET_MODE_CLASS (mode) == MODE_COMPLEX_FLOAT