diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1dbcf18f156..d7b8164b5c6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-27  Richard Henderson  <rth@redhat.com>
+
+	* cgraphunit.c (cgraph_optimize): Maintain timevar stack properly.
+
 2009-10-27  Richard Henderson  <rth@redhat.com>
 
 	PR c++/41819
diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index 7b8b738ed1f..7105e59c5ec 100644
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -1422,7 +1422,10 @@ cgraph_optimize (void)
 
   /* Do nothing else if any IPA pass found errors.  */
   if (errorcount || sorrycount)
-    return;
+    {
+      timevar_pop (TV_CGRAPHOPT);
+      return;
+    }
 
   /* This pass remove bodies of extern inline functions we never inlined.
      Do this later so other IPA passes see what is really going on.  */