diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fbc113e17be..eb7aef154f3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 27 18:36:12 CEST 2003  Jan Hubicka  <jh@suse.cz>
+
+	* toplev.c (rest_of_decl_compilation):  Only varpoolize argument
+	when called before cgraph_optimize.
+
 2003-06-27  Zack Weinberg  <zack@codesourcery.com>
 
 	* config/darwin.h, config/elfos.h, config/i960/i960-coff.h
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 6fd02eb6ad4..c58404a6ad2 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -2190,8 +2190,8 @@ rest_of_decl_compilation (tree decl,
 	 is seen.  But at end of compilation, do output code for them.  */
       if (at_end || !DECL_DEFER_OUTPUT (decl))
 	{
-	  if (flag_unit_at_a_time && TREE_CODE (decl) != FUNCTION_DECL
-	      && top_level)
+	  if (flag_unit_at_a_time && !cgraph_global_info_ready
+	      && TREE_CODE (decl) != FUNCTION_DECL && top_level)
 	    cgraph_varpool_finalize_decl (decl);
 	  else
 	    assemble_variable (decl, top_level, at_end, 0);