[4.0] Approved PR21254 fix different from patch applied to mainline?

[Paolo Bonzini <paolo dot bonzini at lu dot unisi dot ch>]

The PR/21254 has a fix for the 4.0 branch, approved by Mark, that I 
applied a couple of hours ago.  However the patch is different from what 
Zdenek committed to mainline.  It lacks the following line:

Index: loop-iv.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/loop-iv.c,v
retrieving revision 2.26.12.1
diff -p -u -b -r2.26.12.1 loop-iv.c
--- loop-iv.c   17 Aug 2005 12:45:01 -0000      2.26.12.1
+++ loop-iv.c   17 Aug 2005 14:35:46 -0000
@@ -2551,6 +2551,7 @@ zero_iter:
  desc->const_iter = true;
  desc->niter = 0;
  desc->niter_max = 0;
+  desc->noloop_assumptions = NULL_RTX;
  desc->niter_expr = const0_rtx;
  return;
  
Given the context, this line seems necessary to me, but I'd rather have 
approval for this change.  FYI, the rest of the commit is at

http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/loop-iv.c.diff?cvsroot=gcc&only_with_tag=gcc-4_0-branch&r1=2.26&r2=2.26.12.1
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/loop-unroll.c.diff?cvsroot=gcc&only_with_tag=gcc-4_0-branch&r1=1.24&r2=1.24.12.1

and the changelog entry is:

2005-08-17  Paolo Bonzini  <bonzini@gnu.org <mailto:bonzini@gnu.org>>
	
	PR rtl-optimization/21254
	* loop-iv.c (iv_number_of_iterations): Simplify infiniteness
	assumptions for loops that otherwise do not roll.
	(find_simple_exit): Prefer # of iterations that is guaranteed
	not to be infinite.
	* loop-unroll.c (decide_peel_once_rolling,
	decide_peel_completely): Check whether the loop is infinite.

The changelog entry for the change above, instead, is this:

2005-08-17  Paolo Bonzini  <bonzini@gnu.org <mailto:bonzini@gnu.org>>
	
	* loop-iv.c (iv_number_of_iterations): Sync with mainline.

Paolo