diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index 5e909e25882..4d024951313 100644
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -4862,7 +4862,8 @@ rtl_block_empty_p (basic_block bb)
     return true;
 
   FOR_BB_INSNS (bb, insn)
-    if (NONDEBUG_INSN_P (insn) && !any_uncondjump_p (insn))
+    if (NONDEBUG_INSN_P (insn)
+	&& (!any_uncondjump_p (insn) || !onlyjump_p (insn)))
       return false;
 
   return true;