cfgloopanal.c (num_loop_insns, [...]): Count only real insns.

	* cfgloopanal.c (num_loop_insns, average_num_loop_insns): Count only
	real insns.
	* loop-unroll.c (unroll_loop_runtime_iterations): Remove superfluous
	condition.

From-SVN: r66700

gcc/ChangeLog

+2003-05-12  Zdenek Dvorak  <rakdver@atrey.karlin.mff.cuni.cz>
+
+	* cfgloopanal.c (num_loop_insns, average_num_loop_insns): Count only
+	real insns.
+	* loop-unroll.c (unroll_loop_runtime_iterations): Remove superfluous
+	condition.
+
 2003-05-11  Neil Booth  <neil@cat.daikokuya.co.uk>
 
 	* doc/cpp.texi: Fix typos.

gcc/cfgloopanal.c

@@ -1033,6 +1033,7 @@ num_loop_insns (loop)
       bb = bbs[i];
       ninsns++;
       for (insn = bb->head; insn != bb->end; insn = NEXT_INSN (insn))
+	if (INSN_P (insn))
 	  ninsns++;
     }
   free(bbs);
@@ -1057,6 +1058,7 @@ average_num_loop_insns (loop)
 
       binsns = 1;
       for (insn = bb->head; insn != bb->end; insn = NEXT_INSN (insn))
+	if (INSN_P (insn))
 	  binsns++;
 
       ratio = loop->header->frequency == 0

gcc/loop-unroll.c

@@ -878,8 +878,6 @@ unroll_loop_runtime_iterations (loops, loop)
 		DLTHE_FLAG_UPDATE_FREQ))
     	abort ();
 
-      if (i != n_peel)
-	{
       /* Create item for switch.  */
       j = n_peel - i - (extra_zero_check ? 0 : 1);
       p = REG_BR_PROB_BASE / (i + 2);
@@ -908,7 +906,6 @@ unroll_loop_runtime_iterations (loops, loop)
 		     swtch->succ->flags & EDGE_IRREDUCIBLE_LOOP);
       e->probability = p;
     }
-    }
 
   if (extra_zero_check)
     {