diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cb5824a7caff..39521bc129e9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2018-12-14  Bin Cheng  <bin.cheng@linux.alibaba.com>
+
+	* auto-profile.c (afdo_annotate_cfg): Call update_max_bb_count even
+	if autofdo counts are all zeros.
+
 2018-12-14  Bin Cheng  <bin.cheng@linux.alibaba.com>
 
 	* auto-profile.c (afdo_indirect_call): Skip generating histogram
diff --git a/gcc/auto-profile.c b/gcc/auto-profile.c
index f51a4bf4ce11..d337cbc72003 100644
--- a/gcc/auto-profile.c
+++ b/gcc/auto-profile.c
@@ -1553,9 +1553,9 @@ afdo_annotate_cfg (const stmt_set &promoted_stmts)
     {
       /* Calculate, propagate count and probability information on CFG.  */
       afdo_calculate_branch_prob (&annotated_bb);
-      update_max_bb_count ();
-      profile_status_for_fn (cfun) = PROFILE_READ;
     }
+  update_max_bb_count ();
+  profile_status_for_fn (cfun) = PROFILE_READ;
   if (flag_value_profile_transformations)
     {
       gimple_value_profile_transformations ();